caboodle 0.2.14 → 0.2.15

data/VERSION

@@ -1 +1 @@
-0.2.14
+0.2.15

data/lib/caboodle.rb

@@ -1,3 +1,3 @@
 $:<<File.dirname(__FILE__)
 $:<<File.join(File.dirname(__FILE__),"caboodle")
-%{sinatra/base yaml hashie haml 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/helpers caboodle/config caboodle/kit caboodle/app caboodle/scrape}.split.each{|a| require a}

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

@@ -0,0 +1,2 @@
+.page.error.thin_page
+  %h2= @message

data/lib/caboodle/kit.rb

@@ -27,6 +27,13 @@ module Caboodle
     
     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
+    
     class << self
       
       attr_accessor :credit_link
@@ -224,10 +231,20 @@ module Caboodle
         Caboodle::Kits.each { |p| p.start }
       end
     
-      def menu display, path, &block
+      def menu display, path=nil, &block
+        #todo proper slugify
+        slug = display.downcase.gsub(" ","-").gsub("'","")
+        path = "/#{slug}" unless path
         path = "/" if Site.home_kit == self.to_s.gsub("Caboodle::","")
         Caboodle::MenuItems << {:display=>display, :link=>path, :kit=>self}
-        self.get path, &block
+        self.before {@title = display}
+        if block
+          self.get path, &block
+        else
+          eval "self.get '#{path}' do
+          haml :#{slug.gsub("-","_")}
+          end"
+        end
         @@has_menu = true
       end
       
@@ -274,6 +291,15 @@ module Caboodle
         Caboodle::SASS.uniq!
       end
       
+      def add_layout k, v
+        unless Caboodle::Layout[k.to_sym].blank?
+          Caboodle::Layout[k.to_sym] << "\n"
+          Caboodle::Layout[k.to_sym] << v
+        else
+          Caboodle::Layout[k.to_sym] = v
+        end
+      end
+      
       alias_method :stylesheet, :stylesheets
       
       def javascripts array_of_js_files
@@ -298,12 +324,7 @@ module Caboodle
       
       def add_to_layout hash_of_items
         hash_of_items.each do |k,v|
-          unless Caboodle::Layout[k.to_sym].blank?
-            Caboodle::Layout[k.to_sym] << "\n"
-            Caboodle::Layout[k.to_sym] << v
-          else
-            Caboodle::Layout[k.to_sym] = v
-          end
+          add_layout k, v
         end
       end
       
@@ -313,10 +334,10 @@ module Caboodle
         end
       end
       
-      def credit url
+      def credit url, title=nil
         #todo there must be an easier way
         class_eval "def credit_link
-        \"<a rel='me' href='#{url}'>#{self.name.split("::").last}</a>\"
+        \"<a rel='me' href='#{url}'>#{title || self.name.split("::").last}</a>\"
         end"
       end
     

data/lib/caboodle/kits/about/about.rb

@@ -1,17 +1,10 @@
-require 'maruku'
-
-module Caboodle
-  class About < Caboodle::Kit
-    
-    description "Gives you an About page at /about. Edit the Markdown file located in your application config directory."
-    
-    files ["about.md"]
-        
-    menu "About", "/about" do
-      @title = "About"
-      md = File.expand_path(File.join(Caboodle::App.root,"config","about.md"))
-      @content = Maruku.new(open(md).read).to_html_document
-      haml ".page.about.thin_page= @content"
-    end
+class Caboodle::About < Caboodle::Kit
+  
+  description "Gives you an About page at /about. Edit the Markdown file located in your application config directory."
+  
+  files ["about.md"]
+      
+  menu "About", "/about" do
+    markdown :about
   end
 end

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

@@ -1,21 +1,23 @@
-module Caboodle
-  class Analytics < Caboodle::Kit
-    description "Adds Google Analytics to every page of the site"
-    required [:analytics_id]
-  end
-end
-
-Caboodle::Layout.add_to_layout "after_body" => "<script type=\"text/javascript\">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '#{Caboodle::Site.analytics_id}']);
-  _gaq.push(['_setDomainName', 'none']);
-  _gaq.push(['_setAllowLinker', true]);
-  _gaq.push(['_trackPageview']);
+class Caboodle::Analytics < Caboodle::Kit
+  
+  description "Adds Google Analytics to every page of the site"
+  
+  required [:analytics_id]
+  
+  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(['_setDomainName', 'none']);
+      _gaq.push(['_setAllowLinker', true]);
+      _gaq.push(['_trackPageview']);
 
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
 
-</script>"
+    </script>"
+  end
+end

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

@@ -1,11 +1,10 @@
-module Caboodle
-  class Beta < Caboodle::Kit
-    
-    description "Displays a beta message on every page of the site"
-    
-    required [:beta_message]
-    add_sass ["beta"]
-  end
-end
-
-Caboodle::Layout.above_header = "<div id='beta'><p>#{Caboodle::Site.beta_message}</p></div>"
+class Caboodle::Beta < Caboodle::Kit
+  
+  description "Displays a beta message on every page of the site"
+  
+  required [:beta_message]
+  
+  add_sass ["beta"]
+  
+  add_layout :above_header, "<div id='beta'><p>#{Caboodle::Site.beta_message}</p></div>"
+end

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

@@ -2,14 +2,11 @@ module Caboodle
   class Carbonmade < Caboodle::Kit
     description "Embeds a Carbonmade.com portfolio."
     
-    menu "Portfolio", "/portfolio" do
-      @title = "Portfolio"
-      haml :carbonmade
-    end
+    menu "Portfolio"
     
     required [:carbonmade_url]
     
-    credit Caboodle::Site.carbonmade_url
+    credit Caboodle::Site.carbonmade_url, "Carbonmade portfolio"
     
     add_sass ["carbonmade"]
   end

data/lib/caboodle/kits/credits/credits.rb

@@ -0,0 +1,4 @@
+class Caboodle::Credits < Caboodle::Kit
+  description "Adds a Credits page to the footer"
+  menu "Credits"
+end

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

@@ -0,0 +1,3 @@
+.page.credits
+  %h2
+    We'll add a credits page here

data/lib/caboodle/kits/disqus/disqus.rb

@@ -1,13 +1,7 @@
-module Caboodle
-  class Disqus < Caboodle::Kit
-    
-    description "Adds a chat page and support for other kits that require comments"    
-    
-    menu "Chat", "/chat" do
-      @title = "Chat"
-      haml :disqus
-    end
-    
-    required [:disqus]
-  end
+class Caboodle::Disqus < Caboodle::Kit  
+  description "Adds a chat page and support for other kits that require comments"    
+  
+  menu "Chat"
+  
+  required [:disqus]
 end

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

@@ -51,26 +51,17 @@ module Caboodle
     
     description "A browsable Flickr.com gallery with sets"
     
-    menu "Photography", "/photography" do
-      unless Site.flickr_user_id.blank?
-        @photosets = FlickrAPI.photosets rescue []
-        @title = "Photography"
-        haml :photography
-      else
-        "<h2>Please set your Flickr username</h2>"
-      end
+    menu "Photography" do
+      @photosets = FlickrAPI.photosets rescue []
+      haml :photography
     end
     
     get "/photography/:set_id" do |set_id|
-      unless Site.flickr_user_id.blank?
-        @photosets = FlickrAPI.photosets rescue []
-        @set_id = set_id
-        @photoset = Caboodle::FlickrAPI.photoset_info(@set_id) rescue nil
-        @title = "Photography: #{@photoset.title if @photoset.respond_to?(:title)}"
-        haml :photography
-      else
-        "<h2>Please set your Flickr username</h2>"
-      end
+      @photosets = FlickrAPI.photosets rescue []
+      @set_id = set_id
+      @photoset = Caboodle::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]

data/lib/caboodle/kits/geo/geo.rb

@@ -1,14 +1,12 @@
 require 'rack-geo'
 
-module Caboodle
-  class Geo < Caboodle::Kit
-    optional [:zip, :postcode, :address, :latitude, :longitude]
-    
-    before do
-      @latitude, @longitude, @uncertainty = 37.0625, -95.677068, 100
-      @coords = "#{@latitude};#{@longitude} epu=#{@uncertainty}"
-      headers "HTTP_GEO_POSITION" => @coords
-    end    
-    
-  end
+class Caboodle::Geo < Caboodle::Kit
+  optional [:zip, :postcode, :address, :latitude, :longitude]
+  
+  before do
+    @latitude, @longitude, @uncertainty = 37.0625, -95.677068, 100
+    @coords = "#{@latitude};#{@longitude} epu=#{@uncertainty}"
+    headers "HTTP_GEO_POSITION" => @coords
+  end    
+  
 end

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

@@ -3,8 +3,7 @@ module Caboodle
         
     description "A single page which links to all of a Github account's public repos"
     
-    menu "Code", "/code" do
-      @title = "Code"
+    menu "Code" do
       @repos = GithubAPI.repositories
       
       @repos.sort!{|a, b| a.watchers <=> b.watchers}.reverse!
@@ -19,7 +18,7 @@ module Caboodle
     
     required [:github_username]
         
-    credit "http://github.com/#{Site.github_username}"
+    credit "http://github.com/#{Site.github_username}", "Fork #{Site.github_username} on Github"
   end
 
   class GithubAPI < Weary::Base

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

@@ -11,23 +11,18 @@ module Caboodle
     
     before do
       @locations = Config.google_local_locations
-    end
-    
-    menu "Near me", "/near_me" do
-      @title = "Near me"
       @location = Config.google_local_locations.first
-      haml :googlelocal
     end
     
+    menu "Near me"
+    
     get "/near_me/:slug" do
       Config.google_local_locations.each do |loc|
         if loc.title.downcase.gsub(" ","-") == params[:slug]
           @location = loc
         end
       end
-      
-      puts @location.inspect
-      
+            
       if @location
         haml :googlelocal
       else

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

@@ -1,17 +1,15 @@
 require 'digest/md5'
 
-module Caboodle
-  class Standard < Caboodle::Kit
-    
-    description "Sets the logo of the site to your gravatar.com image"
-    
-    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}"
-      end
+class Caboodle::Gravatar < Caboodle::Kit
+  
+  description "Sets the logo of the site to your gravatar.com image"
+  
+  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}"
     end
   end
 end

data/lib/caboodle/kits/history/history.rb

@@ -1,34 +1,11 @@
-gem "sinatra-compass"
-require "sinatra/compass"
-
-gem "compass-susy-plugin"
-require "susy"
-
-require "compass"
-require "sinatra/base"
-require "sinatra/sugar"
-require "sinatra/advanced_routes"
-
-
-module Caboodle
-  class History < Caboodle::Kit
-      
-    description "A list of things you have done in the past."
+class Caboodle::History < Caboodle::Kit
     
-    config_files ["history.yml"]
-        
-    menu "History", "/history" do
-      @title = "History"
-      haml :history
-    end
+  description "A list of things you have done in the past."
+  
+  config_files ["history.yml"]
+  
+  menu "History"
+  
+  add_sass ["history"]
     
-    get("/history/:name.css") do
-      content_type 'text/css', :charset => 'utf-8'
-      options = {:sass_dir => File.join(File.dirname(__FILE__),"views"), :syntax=>:scss}
-      sass :"#{params[:name]}", options.merge!(::Compass.sass_engine_options)
-    end
-    
-    add_sass ["history"]
-    
-  end
 end

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

@@ -5,7 +5,7 @@
     border: 0px !important;
     dt {
       @include adjust-font-size-to(24px);
-      @include slab-family;
+      @include main-family;
       @include columns(1,6);
       border: 0px !important;
     }

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

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

data/lib/caboodle/kits/lazyload/lazyload.rb

@@ -1,6 +1,4 @@
-module Caboodle
-  class LazyLoad < Caboodle::Kit
-    description "Improves page load times for javascript-enabled browsers by loading images on demand as the user scrolls the page."
-    javascripts ["/jquery.lazyload.mini.js","/lazyload.js"]
-  end
+class Caboodle::LazyLoad < Caboodle::Kit
+  description "Improves page load times for javascript-enabled browsers by loading images on demand as the user scrolls the page."
+  javascripts ["/jquery.lazyload.mini.js","/lazyload.js"]
 end

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

@@ -17,16 +17,15 @@ module Caboodle
   class Linkedin < Caboodle::Kit
         
     description "Displays a Linkedin profile as a CV with consistent layout with the rest of the site."
-    
-    menu "CV", "/cv" do
-      @title = "Curriculum Vitae"
-      @linkedin = LinkedinAPI.new #rescue nil
+
+    menu "CV" do
+      @linkedin = LinkedinAPI.new
       haml :cv
     end
     
     required [:linkedin_full_name, :linkedin_profile_url]
     
-    credit Caboodle::Site.linkedin_profile_url
+    credit Caboodle::Site.linkedin_profile_url, "Linkedin profile"
     
     add_sass ["linkedin"]
     

data/lib/caboodle/kits/linkedin/views/linkedin.scss

@@ -25,7 +25,7 @@
   
   h3, dt {
     @include adjust-font-size-to(24px);
-    @include slab-family;
+    @include main-family;
   }
   
   ul.vcalendar {

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

@@ -3,10 +3,7 @@ module Caboodle
         
     description "Embeds a Onepage.com contact card and loads it at /contact"
     
-    menu "Contact", "/contact" do
-      @title = "Contact"
-      haml :contact
-    end
+    menu "Contact"
     
     required [:onepage_username]
     

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

@@ -162,10 +162,8 @@ module Caboodle
      
     rss ["feed://stef.posterous.com/rss.xml"]
     
-    credit "http://#{Caboodle::Site.posterous_sitename}.posterous.com"
+    credit "http://#{Caboodle::Site.posterous_sitename}.posterous.com", "#{Caboodle::Site.posterous_sitename} on Posterous"
     
     add_sass ["posterous"]
   end
-end
-
-#Caboodle::Posterous.new #gets the ID set up
+end

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

@@ -1,7 +1,5 @@
-module Caboodle
-  class SEO < Caboodle::Kit
-    description "Adds basic search engine optimisation"
-    add_to_layout "meta" => "<meta type='keywords' value='#{Caboodle::Site.seo_keywords}' /><meta type='description' value='#{Caboodle::Site.seo_description}' />"    
-    optional [:seo_keywords,:seo_description]
-  end
+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]
 end

data/lib/caboodle/kits/soundcloud/soundcloud.rb

@@ -1,11 +1,10 @@
 module Caboodle
   class Soundcloud < Caboodle::Kit
     description "Displays a search of soundcloud as embedded players on a single page."
-    
-    menu "Mixes", "/mixes" do
-      @title = "Mixes"
+
+    menu "Music" do
       @mixes = SoundcloudAPI.sets
-      haml :soundcloud
+      haml :music
     end
 
     required [:soundcloud_query]
@@ -15,15 +14,15 @@ module Caboodle
 
   class SoundcloudAPI < Weary::Base
     
-      declare "sets" do |r|
-        r.url = "http://api.soundcloud.com/playlists?q=#{Site.soundcloud_query}"
-        r.via = :get
-        r.headers = {'Accept' => 'application/xml'}
-      end
-      
-      def self.sets
-        Hashie::Mash.new(SoundcloudAPI.new.sets.perform_sleepily.parse).playlists
-      end
+    declare "sets" do |r|
+      r.url = "http://api.soundcloud.com/playlists?q=#{Site.soundcloud_query}"
+      r.via = :get
+      r.headers = {'Accept' => 'application/xml'}
+    end
+    
+    def self.sets
+      Hashie::Mash.new(SoundcloudAPI.new.sets.perform_sleepily.parse).playlists
+    end
 
   end
 end

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

@@ -1,13 +1,11 @@
-module Caboodle
-  class Standard < Caboodle::Kit
-    description "The default home page and site options"
-    required [:title, :description, :author]
-    optional [:logo_url]
-    if Caboodle::Site.home_kit.blank?
-      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
-      end
+class Caboodle::Standard < Caboodle::Kit
+  description "The default home page and site options"
+  required [:title, :description, :author]
+  optional [:logo_url]
+  if Caboodle::Site.home_kit.blank?
+    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
     end
   end
-end
+end

data/lib/caboodle/kits/susy/views/susy/_base.scss

@@ -39,8 +39,8 @@ $alt: #ff6600;
   font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, serif;
 }
 
-@mixin slab-family {
-  font-family: "museo-slab-1", "Helvetica Neue", Arial, Helvetica, sans-serif;
+@mixin main-family {
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
   font-weight: lighter;
 }
 

data/lib/caboodle/kits/susy/views/susy/screen.scss

@@ -30,7 +30,7 @@ header#site-header {
   @include trailer(2,32px);
   #logo {
     @include columns(2,12);
-    
+    height: 64px;
     img {
       width: 64px;
       height: auto;
@@ -58,7 +58,6 @@ header#site-header {
     ul {
       @include inline-block-list(12px);
       li {
-        @include slab-family;
       }
     }
   }
@@ -107,7 +106,6 @@ section#main {
 footer {
   @include prefix(2);
   @include full;
-  @include slab-family;
 }
 
 section.subsection {

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

@@ -1,44 +1,36 @@
 gem "tumblr-rb"
 require 'tumblr'
 
-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(" ")
-      end
+class Caboodle::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(" ")
     end
-     
-    required [:tumblr_email, :tumblr_password, :tumblr_sitename]
-    
-    menu "Tumblr", "/tumblr" do
-      puts "Get tumblr"
-      tumblr = ::Tumblr::Reader.new(Caboodle::Site.tumblr_email,Caboodle::Site.tumblr_password)
-      req = tumblr.read(Caboodle::Site.tumblr_sitename, {:num=>10}).perform_sleepily
-      puts req.inspect
-      posts = ::Tumblr::Reader.get_posts(req)
-      puts posts.inspect
-
-      #posts = tumblr.get_posts(result)
-      haml :tumblr, :locals => { :posts => posts }
-    end
-    
-    get "/tumblr/page/:page" do
-      tumblr = ::Tumblr::Reader.new(Caboodle::Site.tumblr_email,Caboodle::Site.tumblr_password)
-      result
-      posts = tumblr.get_posts()
-      haml :tumblr, :locals => { :posts => posts }
-    end
-    
-    add_sass ["tumblr"]
-    
   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
+  
+  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
+  
+  add_sass ["tumblr"]
+  
 end

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

@@ -1,15 +1,11 @@
-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", "/twitter" do
-      @title = "Twitter"
-      haml :twitter
-    end
-    
-    required [:twitter_username]
-    
-    credit "http://twitter.com/#{Caboodle::Site.twitter_username}"
-    
-    add_sass ["twitter"]
-  end
+class Caboodle::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]
+  
+  credit "http://twitter.com/#{Caboodle::Site.twitter_username}", "Follow @#{Caboodle::Site.twitter_username} on Twitter"
+  
+  add_sass ["twitter"]
 end

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

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

data/lib/caboodle/kits/typekit/views/typekit.scss

@@ -0,0 +1,17 @@
+// #todo set the family programatically
+@mixin main-family {
+  font-family: "museo-slab-1", "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-weight: lighter;
+}
+
+footer {
+  @include main-family;
+}
+
+nav {
+  ul {
+    li {
+      @include main-family;
+    }
+  }
+}

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

@@ -0,0 +1,2 @@
+%h2
+  Simple layout

data/lib/caboodle/kits/vimeo/vimeo.rb

@@ -0,0 +1,5 @@
+class Caboodle::Vimeo < Caboodle::Kit
+  description "Displays your Vimeo.com videos"
+  
+  menu "Vimeo"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 2
-  - 14
-  version: 0.2.14
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - Stef Lewandowski
@@ -260,6 +260,7 @@ files:
 - lib/caboodle/app/public/images/favicon.ico
 - lib/caboodle/app/public/images/grid.png
 - lib/caboodle/app/public/js/application.js
+- lib/caboodle/app/views/error.haml
 - lib/caboodle/app/views/layout.haml
 - lib/caboodle/command.rb
 - lib/caboodle/config.rb
@@ -273,11 +274,13 @@ files:
 - lib/caboodle/kits/beta/views/beta.scss
 - lib/caboodle/kits/broken/broken.rb
 - lib/caboodle/kits/carbonmade/carbonmade.rb
-- lib/caboodle/kits/carbonmade/views/carbonmade.haml
 - lib/caboodle/kits/carbonmade/views/carbonmade.scss
+- lib/caboodle/kits/carbonmade/views/portfolio.haml
+- lib/caboodle/kits/credits/credits.rb
+- lib/caboodle/kits/credits/views/credits.haml
 - lib/caboodle/kits/debugger/debugger.rb
 - lib/caboodle/kits/disqus/disqus.rb
-- lib/caboodle/kits/disqus/views/disqus.haml
+- lib/caboodle/kits/disqus/views/chat.haml
 - lib/caboodle/kits/flickr/flickr.rb
 - lib/caboodle/kits/flickr/public/galleria.noconflict.min.js
 - lib/caboodle/kits/flickr/views/photography.haml
@@ -288,8 +291,8 @@ files:
 - lib/caboodle/kits/github/views/github.haml
 - lib/caboodle/kits/googlelocal/config/googlelocal.yml
 - lib/caboodle/kits/googlelocal/googlelocal.rb
-- lib/caboodle/kits/googlelocal/views/googlelocal.haml
 - lib/caboodle/kits/googlelocal/views/googlelocal.scss
+- lib/caboodle/kits/googlelocal/views/near_me.haml
 - lib/caboodle/kits/gravatar/gravatar.rb
 - lib/caboodle/kits/history/config/history.yml
 - lib/caboodle/kits/history/history.rb
@@ -316,7 +319,7 @@ files:
 - lib/caboodle/kits/seo/seo.rb
 - lib/caboodle/kits/skimmed/skimmed.rb
 - lib/caboodle/kits/soundcloud/soundcloud.rb
-- lib/caboodle/kits/soundcloud/views/soundcloud.haml
+- lib/caboodle/kits/soundcloud/views/music.haml
 - lib/caboodle/kits/standard/standard.rb
 - lib/caboodle/kits/standard/views/standard.haml
 - lib/caboodle/kits/susy/susy.rb
@@ -343,6 +346,9 @@ files:
 - lib/caboodle/kits/twitter/views/twitter.scss
 - lib/caboodle/kits/typekit/public/typekit.js
 - lib/caboodle/kits/typekit/typekit.rb
+- lib/caboodle/kits/typekit/views/typekit.scss
+- lib/caboodle/kits/vimeo/views/vimeo.haml
+- lib/caboodle/kits/vimeo/vimeo.rb
 - lib/caboodle/scrape.rb
 - test/helper.rb
 - test/test_caboodle.rb