caboodle 0.2.13 → 0.2.14

data/Rakefile

@@ -22,6 +22,7 @@ begin
     gem.add_dependency "sleepy",">=0.1.4"
     gem.add_dependency "tumblr-rb"
     gem.add_dependency "rack-geo"
+    gem.add_dependency "maruku"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/lib/caboodle/app.rb

@@ -1,6 +1,5 @@
 module Caboodle
   class App < Sinatra::Base 
-
     set :app_file, __FILE__
     set :logging, true
     set :root, File.expand_path(".")

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

@@ -63,7 +63,7 @@
                 - link_class << " active" if p[:kit] == self.class
                 %li
                   = above_nav_item
-                  %a{:href=>p[:link], :class=>link_class}
+                  %a{:href=>p[:link], :class=>link_class, :rel=>"me"}
                     = above_nav_item_title
                     = p[:display]
                     = below_nav_item_title

data/lib/caboodle/kit.rb

@@ -19,6 +19,12 @@ module Caboodle
       response.headers['Cache-Control'] = "public, max-age=#{Caboodle::Site.cache_for}"
     end
     
+    error SocketError do
+      @title = "Whoops!"
+      @message = "Sorry. There was a problem communicating with #{self.class.kit_name}."
+      haml File.open(File.join(Caboodle::Kit.root, "views","error.haml")).read
+    end
+    
     Config = Hashie::Mash.new
     
     class << self
@@ -26,7 +32,7 @@ module Caboodle
       attr_accessor :credit_link
         
       def configure_site config_path
-        set :config, config_path
+        set :config_path, config_path
         if File.exists?(config_path)
           Caboodle::Kit.load_config(config_path)
           Caboodle::Kit.setup
@@ -36,6 +42,7 @@ module Caboodle
       end
       
       def inherited subclass
+        set :kit_root, File.expand_path(File.dirname(caller[0].split(/:in/).last))
         c = caller[0].split(":")
         f = File.dirname(File.expand_path("#{c[0]}"))
         views = File.join(f, "views")
@@ -84,12 +91,28 @@ module Caboodle
             if File.exists?(config_path)
               load_custom_config(config_path)
             else
-              `cp "#{File.join(root,"config",file)}" "#{File.join(Caboodle::App.root,"config",".")}"` rescue "Could not create the config yml file"
+              `cp "#{File.join(kit_root,"config",file)}" "#{File.join(Caboodle::App.root,"config",".")}"` rescue "Could not create the config yml file"
               puts "\nThis kit has a separate configuration file which you must edit:\n #{File.expand_path(File.join(Caboodle::App.root,"config",file))}\n"
             end
           end
         end
       end
+      
+      def files array_of_files
+        configure do
+          array_of_files.each do |file|
+            target_path = File.expand_path(File.join(Caboodle::App.root,"config",file))
+            unless File.exists?(target_path)              
+              `cp "#{File.join(kit_root,"config",file)}" "#{File.join(Caboodle::App.root,"config",".")}"` rescue "Could not create the config yml file"
+            end
+          end
+        end
+      end
+      
+      def description string
+        puts "\n"
+        puts "#{name.to_s.split("::").last}: #{string}"
+      end
 
       def setup
         require_all
@@ -169,7 +192,7 @@ module Caboodle
           end
         end
         optional_settings.each do |r|
-          if Caboodle::Site[r].blank?
+          unless defined?(Caboodle::Site[r])
             ask_user r, true
           end
         end
@@ -293,25 +316,30 @@ module Caboodle
       def credit url
         #todo there must be an easier way
         class_eval "def credit_link
-        \"<a rel='me' href='#{url}' rel='me'>#{self.name.split("::").last}</a>\"
+        \"<a rel='me' href='#{url}'>#{self.name.split("::").last}</a>\"
         end"
       end
     
       def required_settings
-        RequiredSettings[self.ancestors.first.to_s.split("::").last] ||= [] 
-        RequiredSettings[self.ancestors.first.to_s.split("::").last]
+        RequiredSettings[kit_name] ||= [] 
+        RequiredSettings[kit_name]
       end
       
       def optional_settings
-        OptionalSettings[self.ancestors.first.to_s.split("::").last] ||= [] 
-        OptionalSettings[self.ancestors.first.to_s.split("::").last]
+        OptionalSettings[kit_name] ||= [] 
+        OptionalSettings[kit_name]
       end
     
+      def kit_name
+        self.ancestors.first.to_s.split("::").last
+      end
+      
       def available_kits
         Dir.new(File.join(File.dirname(__FILE__),"kits")).entries.delete_if{|a| a[0,1]=="."}
       end
       
       def start
+        
         errors = []
         self.required_settings.each do |s|
           if Site[s].blank?
@@ -323,9 +351,9 @@ module Caboodle
           Caboodle::App.use self 
         else
           STDERR.puts " "
-          STDERR.puts "Warning - #{self.ancestors.first} is disabled because:"
+          STDERR.puts "Warning - #{kit_name} is disabled because:"
           STDERR.puts errors.join("\n") 
-          Caboodle::Errors << Hashie::Mash.new(:title=>"#{self.ancestors.first} is disable", :reason=>errors.join(";"))
+          Caboodle::Errors << Hashie::Mash.new(:title=>"#{kit_name} is disable", :reason=>errors.join(";"))
         end
       end
     end

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

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

data/lib/caboodle/kits/about/config/about.md

@@ -0,0 +1 @@
+A page about me.

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

@@ -1,20 +1,21 @@
 module Caboodle
   class Analytics < Caboodle::Kit
-    add_to_layout "after_body" => "<script type=\"text/javascript\">
+    description "Adds Google Analytics to every page of the site"
+    required [:analytics_id]
+  end
+end
 
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', '#{Caboodle::Site.analytics_id}']);
-      _gaq.push(['_setDomainName', 'none']);
-      _gaq.push(['_setAllowLinker', true]);
-      _gaq.push(['_trackPageview']);
+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']);
 
-      (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>"
-    required [:analytics_id]
-  end
-end
+</script>"

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

@@ -1,5 +1,8 @@
 module Caboodle
   class Beta < Caboodle::Kit
+    
+    description "Displays a beta message on every page of the site"
+    
     required [:beta_message]
     add_sass ["beta"]
   end

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

@@ -1,6 +1,7 @@
 module Caboodle
   class Carbonmade < Caboodle::Kit
-        
+    description "Embeds a Carbonmade.com portfolio."
+    
     menu "Portfolio", "/portfolio" do
       @title = "Portfolio"
       haml :carbonmade

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

@@ -1,8 +1,6 @@
 module Caboodle
   class Debugger < Caboodle::Kit
     
-    puts "Running debugger"
-    puts Caboodle::Debug.inspect
     Caboodle::Debug.each do |debug|
       Caboodle::Layout.below_footer = "<div id='debug'>"
       Caboodle::Layout.below_footer << "<p>#{debug}</p>"

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

@@ -1,6 +1,8 @@
 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

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

@@ -49,6 +49,8 @@ module Caboodle
 
   class Flickr < Caboodle::Kit
     
+    description "A browsable Flickr.com gallery with sets"
+    
     menu "Photography", "/photography" do
       unless Site.flickr_user_id.blank?
         @photosets = FlickrAPI.photosets rescue []

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

@@ -1,6 +1,8 @@
 module Caboodle
   class Github < Caboodle::Kit
         
+    description "A single page which links to all of a Github account's public repos"
+    
     menu "Code", "/code" do
       @title = "Code"
       @repos = GithubAPI.repositories
@@ -16,10 +18,8 @@ module Caboodle
     end
     
     required [:github_username]
-    
-    defaults []
-    
-    credit "http://gitbhu.com/#{Site.github_username}"
+        
+    credit "http://github.com/#{Site.github_username}"
   end
 
   class GithubAPI < Weary::Base

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

@@ -1,15 +1,18 @@
 :google_local_locations:
-  Home:
+  -
+    title: Home
     description: My home is in North London
     address: Southgate, London, UK
-    latitude: 51.511867
-    longitude: -0.127587
-  Work:
-    description: I work at All In near Leicester Square
-    address: 4-5 Great Newport Street, London, WC1 2EH
     latitude: 51.632483
     longitude: -0.127931
-  Old Stomping Ground:
+  -
+    title: Work
+    description: I work at All In near Leicester Square
+    address: 4-5 Great Newport Street, London, WC1 2EH
+    latitude: 51.511867
+    longitude: -0.127587
+  -
+    title: Birmingham
     description: I used to spend a lot of time in Birmingham
     address: 4-5 Great Newport Street, London, WC1 2EH
     latitude: 52.446594

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

@@ -1,18 +1,40 @@
 module Caboodle
   class Googlelocal < Caboodle::Kit
+    
+    description "A google map linking to a list of locations and enabling Local Search around each of them."
+    
     required [:google_maps_api_key]
     
     config_files ["googlelocal.yml"]
     
     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
+    end
+    
     menu "Near me", "/near_me" do
       @title = "Near me"
-      @locations = Config.google_local_locations
-      puts @locations.inspect
+      @location = Config.google_local_locations.first
       haml :googlelocal
     end
     
+    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
+        redirect "/near_me" 
+      end
+    end
+    
     add_sass ["googlelocal"]
   end
 end

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

@@ -1,33 +1,40 @@
-#mapsearch
-  %span
-    Loading...
+.googlelocal.page
+  %nav.locations
+    %ul
+      - @locations.each do |loc|
+        %li
+          %a{:href=>"/near_me/#{loc.title.downcase.gsub(" ","-")}"}
+            = loc.title
+  #mapsearch
+    %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"}
-:javascript
-  window._uds_msw_donotrepair = true;
-%script{:src=>"http://www.google.com/uds/solutions/mapsearch/gsmapsearch.js?mode=new", :type=>"text/javascript"}
-:javascript
-  var localSearch;
-  function LoadMapSearchControl() {
-    var options = {
-      zoomControl : GSmapSearchControl.ZOOM_CONTROL_ENABLE_ALL,
-      title : '#{Caboodle::Site.title}',
-      url : '#{request.host}',
-            idleMapZoom : GSmapSearchControl.ACTIVE_MAP_ZOOM+1,
-            activeMapZoom : GSmapSearchControl.ACTIVE_MAP_ZOOM+1
-    }
+  %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"}
+  :javascript
+    window._uds_msw_donotrepair = true;
+  %script{:src=>"http://www.google.com/uds/solutions/mapsearch/gsmapsearch.js?mode=new", :type=>"text/javascript"}
+  :javascript
+    var localSearch;
+    function LoadMapSearchControl() {
+      var options = {
+        zoomControl : GSmapSearchControl.ZOOM_CONTROL_ENABLE_ALL,
+        title : '#{Caboodle::Site.title}',
+        url : '#{request.host}',
+              idleMapZoom : GSmapSearchControl.ACTIVE_MAP_ZOOM+1,
+              activeMapZoom : GSmapSearchControl.ACTIVE_MAP_ZOOM+1
+      }
          
-    var center = new Object(); 
-    center.lat = #{@locations.first.latitude}; 
-    center.lng = #{@locations.first.longitude};
-    localSearch = new GSmapSearchControl(
-      document.getElementById("mapsearch"),
-      center,
-      options
-    );
-  }
-  $(document).ready(function(){LoadMapSearchControl()});
+      var center = new Object(); 
+      center.lat = #{@location.latitude}; 
+      center.lng = #{@location.longitude};
+      localSearch = new GSmapSearchControl(
+        document.getElementById("mapsearch"),
+        center,
+        options
+      );
+    }
+    $(document).ready(function(){LoadMapSearchControl()});
 
-%h2
-  Search for something in the local area
+  %h2
+    Search for something in the local area

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

@@ -8,4 +8,12 @@
   .gsmsc-idleMapDiv {
     height: 320px;
   }
+}
+
+.page.googlelocal {
+  nav {
+    ul {
+      @include inline-block-list(12px);
+    }
+  }
 }

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

@@ -2,6 +2,9 @@ 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

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

@@ -13,17 +13,9 @@ require "sinatra/advanced_routes"
 module Caboodle
   class History < Caboodle::Kit
       
-    config_files ["history.yml"]
+    description "A list of things you have done in the past."
     
-    configure do
-      config_path = File.expand_path(File.join(Caboodle::App.root,"config","history.yml"))
-      if File.exists?(config_path)
-        Caboodle::Kit.load_config(config_path)
-      else
-        `cp "#{File.join(File.dirname(__FILE__),"config","history.yml")}" "#{File.join(Caboodle::App.root,"config",".")}"` rescue "Could not create the sample yml file"
-        puts "Please enter your history items in the file #{File.expand_path(File.join(Caboodle::App.root,"config","history.yml"))}"
-      end
-    end
+    config_files ["history.yml"]
         
     menu "History", "/history" do
       @title = "History"

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 Caboodle::History::Config.history_years.respond_to?(:sort)
+      - Caboodle::History::Config.history_years.sort.reverse.each do |year,items|
         %dt.year{:class=>year}
           = year
         %dd

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

@@ -1,5 +1,6 @@
 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
 end

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

@@ -1,5 +1,6 @@
 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
 end

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

@@ -16,6 +16,8 @@ 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

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

@@ -1,6 +1,8 @@
 module Caboodle
   class Onepage < Caboodle::Kit
         
+    description "Embeds a Onepage.com contact card and loads it at /contact"
+    
     menu "Contact", "/contact" do
       @title = "Contact"
       haml :contact

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

@@ -132,15 +132,17 @@ module Caboodle
   
   class Posterous < Caboodle::Kit
   
+    description "Displays a Posterous blog with permalinks, pagination and commends if the Disqus kit is included"
+    
     get "/posterous/:page_number" do |page_number|
-      @posts = PosterousPost.page(page_number) rescue nil
+      @posts = PosterousPost.page(page_number)
       not_found if @posts.class == Array && @posts.blank?
       haml :posts
     end
 
     get "/:year/:month/:slug" do |year, month, slug|
       STDERR.puts "Get a post"
-    	post = PosterousPost.from_slug(slug) rescue nil
+    	post = PosterousPost.from_slug(slug)
     	STDERR.puts "Slug not found: #{slug}"
     	not_found unless post
     	@title = post.title
@@ -148,7 +150,7 @@ module Caboodle
     end
     
     menu "Blog", "/posterous" do
-      @posts = PosterousPost.all(:page=>(params[:page] || 1)) rescue []
+      @posts = PosterousPost.all(:page=>(params[:page] || 1))
       haml :posts.to_sym
     end
     

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

@@ -1,5 +1,6 @@
 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

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

@@ -1,5 +1,6 @@
 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"

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

@@ -1,5 +1,6 @@
 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?

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

@@ -11,7 +11,7 @@ require "sinatra/advanced_routes"
 
 module Caboodle
   class Susy < Caboodle::Kit
-            
+    description "Adds Susy CSS formatting"     
     get("/susy/:name.css") do
       content_type 'text/css', :charset => 'utf-8'
       sass_dir = File.expand_path(File.join(File.dirname(__FILE__),"views","susy"))

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

@@ -51,9 +51,7 @@ header#site-header {
       color: #ddd;
     }
   }
-  #access {
-    @include skip-link();
-  }
+
   nav {
     @include trailer(1,32px);
     @include prefix(2);
@@ -66,6 +64,10 @@ header#site-header {
   }
 }
 
+#access {
+  @include skip-link();
+}
+
 section#main {
   @include full;
   header#page_title

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

@@ -3,7 +3,8 @@ 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)

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

@@ -1,6 +1,6 @@
 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

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

@@ -1,5 +1,6 @@
 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]
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - Stef Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +01:00
+date: 2010-08-31 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,6 +205,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id013
 description: Caboodle is a Rack and Sinatra-based framework for creating websites which combine information from various online services. There are Kits for many of the larger services, which provide a way to retrieve and display photos, videos, blog posts, status updates and so on. Caboodle normalises the display of all of these discrete Kits so that you can create a website which looks seamless but is made up of a variety of things from a variety of sources.
 email: stef@stef.io
 executables: 
@@ -252,6 +266,8 @@ files:
 - lib/caboodle/config/defaults.yml
 - lib/caboodle/helpers.rb
 - lib/caboodle/kit.rb
+- lib/caboodle/kits/about/about.rb
+- lib/caboodle/kits/about/config/about.md
 - lib/caboodle/kits/analytics/analytics.rb
 - lib/caboodle/kits/beta/beta.rb
 - lib/caboodle/kits/beta/views/beta.scss