caboodle 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

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

@@ -2,4 +2,6 @@ has_footer: true
 has_caboodle_link: true
 kits:
 - Posterous
-- Skimmed
+- Skimmed
+- Susy
+- Jquery

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

@@ -1,6 +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}/
     %meta{:content => "text/html; charset=utf-8", "http-equiv" => "content-type"}/
     %meta{:content => "index,follow", :name => "robots"}/
     %meta{:content => "Caboodle", :name => "generator"}/
@@ -8,26 +9,20 @@
     = meta
     
     %title= title
-    %link{:href => "/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"}/
     
     - Caboodle::Stylesheets.each do |css|
-      %link{:rel => "stylesheet", :rel => css, :type => "text/css"}    
-    
-    %link{:href => Caboodle::Site.url_base, :rel => "index", :title => Caboodle::Site.title}/
+      %link{:rel => "stylesheet", :href => css, :type => "text/css"}    
    
-    %script{:charset => "utf-8", :src => "http://ajax.googleapis.com/ajax/libs/jquery/#{Caboodle::Site.jquery_version || "1.4.2"}/jquery.min.js", :type => "text/javascript"}
-    %script{:charset => "utf-8", :src => "/js/application.js", :type => "text/javascript"}
-
     - Caboodle::Javascripts.each do |js|
       %script{:charset => "utf-8", :src => js, :type => "text/javascript"}
-
+      
+    %script{:charset => "utf-8", :src => "/js/application.js", :type => "text/javascript"}
+    
     - Caboodle::RSS.each do |rss|
       %link{:href => rss, :rel => "alternate", :type => "application/rss+xml"}/
     
     = head
-    
-    = root
-    
+        
   %body.caboodle
     = before_page
     #page.hfeed
@@ -82,16 +77,23 @@
           = below_social
         = after_social 
         = before_content
+        - if Caboodle::Errors.size > 0
+          %section#errors
+            - Caboodle::Errors.each do |err|
+              %h2
+                = err.title
+              %p.reason
+                = err.reason
         %section#content
           = above_content
           = yield
           = below_content
         = after_content
-        - if credit
+        - if self.credit_link
           = before_credit
           %section#credit
             = above_credit
-            = credit
+            = self.credit_link
             = below_credit
           = after_credit
       = after_main

data/lib/caboodle/app/views/stylesheets/screen.scss

@@ -0,0 +1,140 @@
+/* Welcome to Susy. Use this file to define screen styles.
+ * Import this file using the following HTML or equivalent:
+ * <link href="/stylesheets/screen.css" media="screen" rel="stylesheet" type="text/css" /> */
+
+// Imports --------------------------------------------------------------*/
+
+@import "defaults";
+
+/* Layout --------------------------------------------------------------*/
+
+@include susy;
+
+// change '#page' to match your HTML container element(s)
+#page {
+  @include container;
+  //@include show-grid("grid.png"); 
+  @include sans-family;
+}
+
+// show-grid loads a 64+16x24 grid image by default
+// For other grid settings, run `compass grid-img 30+10x20`
+// Where 30 is the column width, 10 is the gutter width, 
+// and 20 is the (optional) line-height.
+
+/* Styles --------------------------------------------------------------*/
+
+header#site-header {
+  @include full;
+  @include leader(6,32px);
+  @include trailer(2,32px);
+  #logo {
+    @include columns(1,12);
+    @include prefix(1);
+    img {
+      width: 64px;
+      height: auto;
+      
+    }
+  }
+  #site-title {
+    @include columns(5,12);
+    h1{
+      @include adjust-font-size-to(24px);
+      color: black;
+    }
+  }
+  #site-description {
+    @include columns(5,12);
+    h2 {
+      @include adjust-font-size-to(24px);
+      color: #ddd;
+    }
+  }
+  #access {
+    @include skip-link();
+  }
+  nav {
+    @include trailer(1,32px);
+    @include prefix(2);
+    ul {
+      @include inline-block-list(12px);
+      li {
+        @include slab-family;
+      }
+    }
+  }
+}
+
+section#main {
+  @include full;
+  header#page_title
+  {
+    h1, h2 {
+      @include adjust-font-size-to(48px);
+      color: #aaa;
+      @include prefix(2);
+    }
+  }
+  section#content {
+    min-height: 320px;
+    @include prefix(0);
+    @include columns(12,12);
+    @include leader(1,32px);
+    h1, h2 {
+      @include adjust-font-size-to(24px);
+    }
+    article {
+      @include trailer(2,32px);
+      aside {
+        color: #aaa;
+        a {
+          color: #999;
+        }
+      }
+    }
+  }
+  aside#sidebar {
+    @include columns(2,12);
+    ul {
+      @include no-style-list;
+    }
+  }
+}
+
+footer {
+  @include prefix(2);
+  @include full;
+  @include slab-family;
+}
+
+section.subsection {
+  @include columns(12,12);
+  aside.submenu {
+    @include columns(2,12);
+    ul {
+      @include no-style-list;
+      @include adjust-font-size-to(12px);
+    }
+  }
+  
+  section.subpage {
+    @include columns(9,12);
+  }
+}
+
+.page {
+  @include prefix(2);
+  iframe {
+    width: 580px;
+    height: 580px;
+    background-color: #eee;
+    padding: 32px;
+    overflow: hidden;
+    scroll: none;
+  }
+}
+
+#testing {
+  background-color: red;
+}

data/lib/caboodle/app.rb

@@ -1,32 +1,17 @@
 module Caboodle
-  class App < Sinatra::Base
-    register Sinatra::Compass
-      
+  class App < Sinatra::Base 
+
     set :app_file, __FILE__
     set :logging, true
     set :root, File.expand_path(".")
     set :views, Proc.new { File.join(root, "views") }
     set :public, Proc.new { File.join(root, "public") }
-    #disable :run, :reload
-    # set :compass, :sass_dir => File.join(root, "stylesheets")
-    #   
-    # get_compass("/css/:name.css") do
-    #   compass :one_stylesheet
-    # end
     
     helpers Sinatra::CaboodleHelpers
-  
+    
     configure do
-      config_path = File.expand_path(File.join(root,"config","site.yml"))
-      if File.exists?(config_path)
-        Caboodle::Kit.load_config(config_path)
-        Caboodle::Kit.setup
-      end      
+      Caboodle::Kit.configure
     end
-    # get '/:kit/stylesheet.css' do
-    #   header 'Content-Type' => 'text/css; charset=utf-8'
-    #   sass :stylesheet
-    # end
   
   end
 end

data/lib/caboodle/command.rb

@@ -12,6 +12,7 @@ module Caboodle
           puts `cd #{args.first} && cp -r #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/* .`
           puts `cd #{args.first} && cp #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/.gems .`
           puts `cd #{args.first} && git init`
+          Caboodle::Kit.configure
           puts `cd #{args.first} && git add .`
           puts `cd #{args.first} && git commit -m"initial setup"`
           puts `cd #{args.first} && heroku create #{args.first}`

data/lib/caboodle/config.rb

@@ -4,7 +4,8 @@ module Caboodle
   Javascripts      = []
   Stylesheets      = []
   RSS              = []
-  
+  SASS             = []
+  Errors           = []
   Defaults         = Hashie::Mash.new(Hashie::Mash.new(YAML.load_file(File.join(File.dirname(__FILE__), 'config','defaults.yml'))))
   RequiredSettings = Hashie::Mash.new()
   Layout           = Hashie::Mash.new()

data/lib/caboodle/helpers.rb

@@ -5,10 +5,6 @@ module Sinatra
       Caboodle::Layout[arg]
     end
     
-    def credit
-      #Caboodle::Kit.credit
-    end
-    
     def title
       if request.path_info == "/"
         "#{Caboodle::Site.title} | #{Caboodle::Site.description}"

data/lib/caboodle/kit.rb

@@ -1,7 +1,6 @@
 module Caboodle
   
   class Kit < Sinatra::Base
-    #register Sinatra::Compass
     
     set :app_file, __FILE__
     set :logging, true
@@ -21,6 +20,15 @@ module Caboodle
     end
     
     class << self
+      attr_accessor :credit_link
+        
+      def configure
+        config_path = File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
+        if File.exists?(config_path)
+          Caboodle::Kit.load_config(config_path)
+          Caboodle::Kit.setup
+        end
+      end
       
       def inherited subclass
         c = caller[0].split(":")
@@ -45,12 +53,16 @@ module Caboodle
       end
 
       def dump_config
-        puts "Dump config"
-        p = File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
-        d = Caboodle::Site.clone
-        e = d.to_hash
-        e.delete("required_settings")
-        File.open(p, 'w') {|f| f.write(YAML::dump(e))}
+        begin
+          puts "Dump config"
+          p = File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
+          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 config file"
+        end
       end
 
       def setup
@@ -155,6 +167,15 @@ module Caboodle
         Caboodle::Stylesheets.uniq!
       end
       
+      def add_sass array_of_sass_files
+        if array_of_sass_files.class == Array
+          array_of_sass_files.each { |a| Caboodle::SASS << a.to_s }
+        else
+          Caboodle::SASS << array_of_sass_files.to_s
+        end
+        Caboodle::SASS.uniq!
+      end
+      
       alias_method :stylesheet, :stylesheets
       
       def javascripts array_of_js_files
@@ -195,8 +216,11 @@ module Caboodle
         end
       end
       
-      def original url
-        set :credit, "<a href='#{url}' rel='me'>via #{self.class.name.split("::").last}</a>"
+      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>\"
+        end"
       end
     
       def required_settings
@@ -218,6 +242,7 @@ module Caboodle
           STDERR.puts " "
           STDERR.puts "Warning - #{self.ancestors.first} is disabled because:"
           STDERR.puts errors.join("\n") 
+          Caboodle::Errors << Hashie::Mash.new(:title=>"#{self.ancestors.first} is disable", :reason=>errors.join(";"))
         end
       end
     end

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

@@ -0,0 +1,13 @@
+module Caboodle
+  class Carbonmade < Caboodle::Kit
+        
+    menu "Portfolio", "/portfolio" do
+      @title = "Portfolio"
+      haml :carbonmade
+    end
+    
+    required [:carbonmade_url]
+    
+    credit Caboodle::Site.carbonmade_url
+  end
+end

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

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

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

@@ -62,6 +62,8 @@ module Caboodle
     
     javascripts ["/galleria.noconflict.min.js"]
     
-    original "http://flickr.com/#{Caboodle::Site.flickr_username}"
+    add_sass ["photography"]
+    
+    credit "http://flickr.com/#{Caboodle::Site.flickr_username}"
   end
 end

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

@@ -0,0 +1,24 @@
+#galleria_gallery {
+  @include columns(10,10);
+  #main_image {
+    @include trailer(2,32px);
+    min-height: 320px;
+    min-width: 532px;
+    background-color: #f6f6f6;
+    text-align: center;
+    padding: 16px;
+    img {
+      vertical-align: middle;
+      @include box-shadow(0px, 0px, 32px, #aaaaaa);
+    }
+  }
+  #gallery.gallery {
+    @include columns(10,10);
+    ul {
+      @include no-style-list;
+      li {
+        display: inline-block;
+      }
+    }
+  }
+}

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

@@ -19,7 +19,7 @@ module Caboodle
     
     defaults []
     
-    original "http://gitbhu.com/#{Site.github_username}"
+    credit "http://gitbhu.com/#{Site.github_username}"
   end
 
   class GithubAPI < Weary::Base

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

@@ -0,0 +1,40 @@
+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
+        
+    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
+        
+    menu "History", "/history" do
+      @title = "History"
+      haml :history
+    end
+    
+    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/{portfolio/views/portfolio.haml → history/views/history.haml}

@@ -1,12 +1,12 @@
 - #todo - this should be a vcalendar
-#portfolio.page
+#history.page
   %dl
-    - if Caboodle::Site.portfolio_years.respond_to?(:sort)
-      - Caboodle::Site.portfolio_years.sort.reverse.each do |year,items|
+    - if Caboodle::Site.history_years.respond_to?(:sort)
+      - Caboodle::Site.history_years.sort.reverse.each do |year,items|
         %dt.year{:class=>year}
           = year
         %dd
-          %ul.portfolio_items
+          %ul.history_items
             - if items.respond_to?(:each)
               - items.each do |item|
                 %li.portfolio_item{:class=>item.tags}

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

@@ -0,0 +1,21 @@
+
+#history {
+  dl {
+    @include no-style-list;
+    border: 0px !important;
+    dt {
+      @include adjust-font-size-to(24px);
+      @include slab-family;
+      @include columns(1,6);
+      border: 0px !important;
+    }
+    dd {
+      @include columns(4,6);
+      border: 0px !important;
+      .awards {
+        @include adjust-font-size-to(12px);
+      }
+    }
+  }
+}
+

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

@@ -0,0 +1,5 @@
+module Caboodle
+  class Jquery < Caboodle::Kit
+    javascripts ["http://ajax.googleapis.com/ajax/libs/jquery/#{Caboodle::Site.jquery_version || "1.4.2"}/jquery.min.js"]
+  end
+end

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

@@ -24,6 +24,9 @@ module Caboodle
     
     required [:linkedin_full_name, :linkedin_profile_url]
     
-    original Caboodle::Site.linkedin_profile_url
+    credit Caboodle::Site.linkedin_profile_url
+    
+    add_sass ["linkedin"]
+    
   end
 end

data/lib/caboodle/kits/linkedin/views/cv.haml

@@ -1,4 +1,4 @@
-.page.linkedin
+.page#linkedin
   - if @linkedin
     = @linkedin.full
   - else

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

@@ -0,0 +1,61 @@
+#linkedin{
+  #additional-information{
+    h2 + h3 {
+      display: none;
+    }
+  }
+  
+  #additional-information {
+    .websites {
+      display: none;
+    }
+  }
+  #contact-settings, .affiliation {
+    display :none;
+  }
+  @include adjust-font-size-to(14px);
+  .showhide-link, .connections, .recommended, hr {
+    display: none;
+  }
+  h2 {
+    @include adjust-font-size-to(32px);
+    @include leader(2,32px);
+    @include trailing-border(2px,1,32px, solid);
+  }
+  
+  h3, dt {
+    @include adjust-font-size-to(24px);
+    @include slab-family;
+  }
+  
+  ul.vcalendar {
+    padding-left: 32px;
+    background-color: #eee;
+    @include padding-leader(1,32px);
+    @include padding-trailer(1,32px);
+  }
+  
+  #summary {
+    
+  }
+  #overview {
+    @include trailer(2,32px);
+    @include columns(8,8);
+    -moz-column-count: 2;
+    -moz-column-gap: 32px;
+    -webkit-column-count: 2;
+    -webkit-column-gap: 32px;
+    column-count: 2;
+    column-gap: 32px;
+    dl {
+      dt {
+        
+      }
+      dd {
+        
+      }
+    }
+  }
+  
+}
+

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

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

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

@@ -132,7 +132,7 @@ module Caboodle
   
   class Posterous < Caboodle::Kit
   
-    get "/blog/:page_number" do |page_number|
+    get "/posterous/:page_number" do |page_number|
       @posts = PosterousPost.page(page_number) rescue nil
       not_found if @posts.class == Array && @posts.blank?
       haml :posts
@@ -147,8 +147,8 @@ module Caboodle
     	haml :post, :locals => { :post => post }
     end
     
-    menu "Blog", "/blog" do
-      @posts = PosterousPost.all(:page=>(params[:page] || 1))
+    menu "Blog", "/posterous" do
+      @posts = PosterousPost.all(:page=>(params[:page] || 1)) rescue []
       haml :posts.to_sym
     end
     
@@ -158,7 +158,9 @@ module Caboodle
      
     rss ["feed://stef.posterous.com/rss.xml"]
     
-    original "http://#{Caboodle::Site.posterous_sitename}.posterous.com"
+    credit "http://#{Caboodle::Site.posterous_sitename}.posterous.com"
+    
+    add_sass ["posterous"]
   end
 end
 

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

@@ -0,0 +1,17 @@
+.posterous {
+  @include prefix(2);
+  #pagination {
+    @include leader(3,32px);
+    @include trailer(3,32px);
+    font-weight: bold;
+  }
+  @include columns(6,10);
+  article {
+    h2 > a {
+      display: none;
+    }
+    h2.entry-title a {
+      display: inline !important;
+    }
+  }
+}