vitae 0.1.3 → 0.1.4

data/.gitignore

@@ -2,4 +2,7 @@
 pkg/*
 *.gem
 .bundle
-tmp
+tmp
+.autotest
+Gemfile.lock
+.yardoc

data/README.rdoc

@@ -5,7 +5,7 @@ Vitae is to CVs what rubygems is to ruby code.
 It's also very under development right now, and not very useful yet. Come back soon!
 
 
-=== Usage
+== Usage
 First install the vitae gem:
   $: sudo gem i vitae
 
@@ -20,19 +20,18 @@ Now lets create a new project called my_cv_project, with some named CVs:
 Great, it's created our two named CVs in the my_cv_project/cvs directory from a basic yaml template. Edit these yaml files with your own info (note: currently data is not actually read from these, that will change soon).
 
 Once your done editing, start up the server:
-  $: cd my_cv_project
-  $: vitae server
+  $: vitae server my_cv_project
     Serving 2 CVs at http://0.0.0.0:3141/ from my_cv_project
 
 Enjoy!
 
-=== Future plans
+== Future plans
 1. All data read from the yaml files should be displayed sensibly.
 2. Vitae should com bundled with better default templates - CSS, JS and YAML.
 3. Support for multiple themes.
 4. The clever stuff
 
-=== The clever stuff
+== The clever stuff
 Much like rubygems or git
 
 Push a CV:
@@ -50,13 +49,13 @@ Pull a CV:
     Theme pulled to themes/darkness
     Theme pulled to themes/espresso
 
-=== Want to help?
+== Want to help?
 Just the github usual for development - fork, commit, pull request, bonus points for tests.
 Have a play and report bugs, request features via the issue tracker.
 
 Feel free to email me at arthur@gunn.co.nz
 
-=== Credits
+== Credits
 Development by Arthur Gunn.
 
 Thanks to Maxim Chernyak and Juriy Zaytsev for CSS used in the default theme.

data/lib/vitae.rb

@@ -1,6 +1,4 @@
 $:.unshift File.dirname(File.expand_path(__FILE__))
-require "vitae/cv"
-require "vitae/ordered_hash"
 
 module Vitae
   @@project_root = nil
@@ -13,7 +11,7 @@ module Vitae
     @@project_root = root
   end
   
-  module OrderedHashExtensions
+  module HashExtensions
     def except(exceptions=[])
       reject do |k, v|
         exceptions.include? k
@@ -23,4 +21,7 @@ module Vitae
   
 end
 
-Hash.send :include, Vitae::OrderedHashExtensions
+require "vitae/cv"
+require "vitae/ordered_hash"
+
+Hash.send :include, Vitae::HashExtensions

data/lib/vitae/cli.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "thor"
 
 module Vitae
@@ -17,6 +16,8 @@ module Vitae
       self.destination_root = name
       puts "creating #{name}..."
       
+      copy_file "config.ru"
+      
       if cv_names.size > 0
         cv_names.each do |cv_name|
           @name = cv_name
@@ -48,13 +49,15 @@ module Vitae
       
       port_set_by_user = ARGV.any? { |a| %w[-p --port].include?( a ) }
       
+      
+      Vitae::project_root = File.expand_path(project_path, Dir.pwd)
+      
       server = Rack::Server.new.tap do |s|
-        s.options[:config]  = File.join(File.dirname(__FILE__), "..", "..", "config.ru")
+        s.options[:config]  = File.join(Vitae::project_root, "config.ru")
         s.options[:Port]    = 3141 unless port_set_by_user
       end
       
-      require "vitae/server/server"
-      Vitae::project_root = File.expand_path(project_path, Dir.pwd)
+      
       
       opts = server.options
       cv_count = CV.all.size

data/lib/vitae/cv.rb

@@ -1,6 +1,8 @@
+require "vitae/delegators"
 require "yaml"
 
 class CV
+  extend Vitae::Delegators
   attr_reader :file_name
   
   class << self
@@ -17,16 +19,12 @@ class CV
         cv.file_name == file_name
       end
     end
-    
-    def first
-      all.first
-    end
-    
-    def last
-      all.last
-    end
   end
   
+  class_delegate :first, :last, :size, :to => :all
+  delegate :[], :except, :each, :to => :data_hash
+  
+  
   def initialize yaml_file
     @yaml_file = yaml_file
     @file_name = File.basename(yaml_file, '.yaml')
@@ -45,20 +43,6 @@ class CV
     @data_hash ||= YAML::load_file(@yaml_file)
   end
   
-  def [] key
-    data_hash[key]
-  end
-  
-  def except exceptions=[]
-    data_hash.except( exceptions )
-  end
-  
-  def each &block
-    data_hash.each do |k, v|
-      yield k, v
-    end
-  end
-  
   
   def link
     "/#{file_name}"

data/lib/vitae/delegators.rb

@@ -0,0 +1,26 @@
+module Vitae::Delegators
+  
+  def class_delegate *args
+    target = args.pop[:to] rescue raise(ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter).")
+    actions = args
+    metaclass = (class << self; self; end)
+    
+    actions.each do |action|
+      metaclass.send(:define_method, action) do |*args|
+        send(target).send(action, *args)
+      end
+    end
+  end
+  
+  def delegate *args
+    target = args.pop[:to] rescue raise(ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter).")
+    actions = args
+    
+    actions.each do |action|
+      define_method action do |*args|
+        send(target).send(action, *args)
+      end
+    end
+  end
+  
+end

data/lib/vitae/ordered_hash.rb

@@ -1,20 +1,21 @@
 require 'yaml'
 
 YAML.add_builtin_type("omap") do |type, val|
-  ActiveSupport::OrderedHash[val.map(&:to_a).map(&:first)]
+  Vitae::OrderedHash[val.map(&:to_a).map(&:first)]
 end
 
-module ActiveSupport
+module Vitae
+  # This OrderedHash class was stolen from ActiveSupport.
   # The order of iteration over hashes in Ruby 1.8 is undefined. For example, you do not know the
-  # order in which +keys+ will return keys, or +each+ yield pairs. <tt>ActiveSupport::OrderedHash</tt>
+  # order in which +keys+ will return keys, or +each+ yield pairs. <tt>Vitae::OrderedHash</tt>
   # implements a hash that preserves insertion order, as in Ruby 1.9:
   #
-  #   oh = ActiveSupport::OrderedHash.new
+  #   oh = Vitae::OrderedHash.new
   #   oh[:a] = 1
   #   oh[:b] = 2
   #   oh.keys # => [:a, :b], this order is guaranteed
   #
-  # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
+  # <tt>Vitae::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
   class OrderedHash < ::Hash #:nodoc:
     def to_yaml_type
       "!tag:yaml.org,2002:omap"

data/lib/vitae/server/helpers.rb

@@ -3,10 +3,12 @@ module Helpers
     @cv && @cv.theme || "default"
   end
   
-  def include_theme_assets
-    html = content_tag(:script, nil, :type => "text/javascript", :src => "/#{current_theme}/application.js")
-    html << "\n"+tag(:link, nil, :type => "text/css", :media => "screen", :rel => "stylesheet", :href => "/#{current_theme}/application.css")
-    html
+  def include_theme_css
+    tag(:link, nil, :type => "text/css", :media => "screen", :rel => "stylesheet", :href => "/#{current_theme}/application.css")
+  end
+  
+  def include_theme_js
+    content_tag(:script, nil, :type => "text/javascript", :src => "/#{current_theme}/application.js")
   end
   
   def link_to(text, *args)

data/lib/vitae/server/node.rb

@@ -0,0 +1,185 @@
+module Vitae::Nodes
+
+class Node
+  include Haml::Helpers
+  include Helpers
+
+  attr_reader :level, :name, :data, :path
+
+  class << self    
+    def set(option, value=self, &block)
+      value = block if block
+      if value.kind_of?(Proc)
+        define_method option, &value
+      elsif value == self && option.respond_to?(:each)
+        option.each { |k,v| set(k, v) }
+      else
+        set option, Proc.new{value}
+      end
+      self
+    end
+
+    def types
+      {
+        "simple_tag_cloud" => SimpleTagCloudNode,
+        "tag_cloud" => TagCloudNode,
+        "project_list" => ProjectListNode,
+        "project" => ProjectNode,
+        "base" => BaseNode,
+        "standard" => Node
+      }
+    end
+  end
+
+  def initialize(data, name=nil, level=1, parent_path=[])
+    @data = data
+    @name = name
+    @level = level
+    @path = parent_path << name
+  
+    init_haml_helpers
+  end
+
+  def to_s
+    capture_haml do
+      html
+    end
+  end
+
+  def html
+    haml_tag "h#{level}", name if name
+    show_data
+  end
+
+  def output_data
+    data.except(%w[node_type intro extro])
+  end
+
+  def show_data
+    case data
+    when Hash
+      # haml_tag "p", self.class.name, :style => "color:red"
+      haml_tag ".intro", data["intro"] if data["intro"]
+      show_hash
+      haml_tag ".extro", data["extro"] if data["extro"]
+    when Array
+      haml_concat "Array!"
+    else
+      haml_concat data
+    end
+  end
+
+  def collection_wrapper &block
+    return block.call unless collection_tag
+    haml_tag collection_tag, &block
+  end
+
+  def node_wrapper &block
+    return block.call unless node_tag
+    haml_tag node_tag, &block
+  end
+
+  set :collection_tag => "ul", :node_tag => "li"
+
+  def show_hash
+    collection_wrapper do
+      output_data.each do |key, value|
+        node_class = child_node_class(key, value)
+        node_wrapper do
+          haml_concat node_class.new(value, key, level+1, path)
+        end
+      end
+    end
+  end
+
+  def child_node_class_from_yaml(value)
+    Node.types[value["node_type"]] if value.respond_to? :[]
+  end
+
+  def child_node_class_from_name(name)
+    case name
+    when /expertise/i then TagCloudNode
+    when /projects/i  then ProjectListNode
+    else Node
+    end
+  end
+
+  def child_node_class(key, value)
+    child_node_class_from_yaml(value) || default_child_node_class || child_node_class_from_name(key)
+  end
+  set :default_child_node_class, nil
+
+end
+
+# Define all the classes upfront so that they can rely on one another.
+%w[ProjectNode TagCloudNode ProjectListNode BaseNode SimpleTagCloudNode].each do |class_name|
+  Vitae::Nodes.const_set(class_name, Class.new(Node))
+end
+
+class BaseNode < Node
+  set :collection_tag, nil
+  set :node_tag, nil
+end
+
+class TagCloudNode < Node
+  set :collection_tag, "ul#expertise.tags"
+  
+  def show_hash
+    collection_wrapper do
+      output_data.each do |key, value|
+        haml_tag "li.skill", key, :class => value
+      end
+    end
+  end
+end
+
+class SimpleTagCloudNode < Node
+  set :collection_tag, "ul#expertise.tags"
+  
+  def show_hash
+    collection_wrapper do
+      output_data.each_with_index do |(key, value), index|
+        percent = ((output_data.size-index)/output_data.size.to_f)*70 + 75
+        haml_tag "li.skill", key, :style => "font-size:#{percent}%;"
+      end
+    end
+  end
+end
+
+class ProjectListNode < Node
+  set :collection_tag, "ul.jobs-list.vcalendar"
+  set :node_tag, "li.vevent.experience"
+  set :default_child_node_class, ProjectNode
+end
+
+class ProjectNode < Node
+  def html
+    link = link_to(name, data["url"]) if data["url"]
+    haml_tag "h#{level}" do
+      haml_tag "span.location", (link||name)
+      if data["role"]
+        haml_concat " - "
+        haml_tag "span.summary", data["role"]
+      end
+      show_date_range
+    end
+  
+    haml_tag "p.job-description", data["description"]
+    # show_data
+  end
+
+  def show_date_range
+    return unless data["start"] || data["end"]
+  
+    start_text = data["start"] ? data["start"].strftime("%B %Y") : nil
+    end_text   = data["end"]   ? data["end"].strftime("%B %Y")   : "Present"
+  
+    haml_tag "span.dtrange" do
+      haml_tag "span.dtstart", start_text, :title => data["start"] if start_text
+      haml_concat "-"
+      haml_tag "span.dtend", end_text, :title => data["end"] if end_text
+    end
+  end
+end
+  
+end

data/lib/vitae/server/server.rb

@@ -1,12 +1,17 @@
 require 'sinatra/base'
 require 'haml'
 require "vitae/server/helpers"
+require "vitae/server/node"
 
 class Server < Sinatra::Base
   helpers Helpers
   set :views, File.dirname(__FILE__) + '/views'
   set :public, File.join(Vitae::project_root, "themes") rescue ''
   
+  before do
+    request.path_info = CV.first.link if CV.size==1
+  end
+  
   get '/' do
     @cvs = CV.all
     haml :index
@@ -17,8 +22,16 @@ class Server < Sinatra::Base
   end
   
   get '/:name' do
+    reload_nodes_module if ENV["RACK_ENV"]=="development"
+    
     @cv = CV.find( params[:name] )
     haml :show
   end
   
+  def reload_nodes_module
+    warn "Reloading Nodes module"
+    Vitae.send :remove_const, :Nodes if defined? Vitae::Nodes
+    load File.join(File.dirname(__FILE__), "node.rb")
+  end
+  
 end

data/lib/vitae/server/views/layout.haml

@@ -2,7 +2,10 @@
 %html
   %head
     %title Vitae #{ @cv && ": "+ @cv.name }
-    = include_theme_assets
+    = include_theme_css
   %body
+    %div
+      %button#summarise{:style => "display:none"} Summarise!
     #content
-      = yield
+      = yield
+    = include_theme_js

data/lib/vitae/server/views/show.haml

@@ -1,21 +1,8 @@
-= haml :vcard
-- @cv.except(%w[vitae_config contact]).each do |category, value|
-  %h2= category
-  .category{ :id => category }
-    - case value
-    - when String
-      = value
-    - when Hash
-      %ul.jobs-list
-        - value.each do |subcategory, subvalue|
-          %li.vevent.experience
-            %h3= subcategory
-            %p.job-description= subvalue
-              
-      / - value.each do |subcategory, subvalue|
-      /   %h3= subcategory  
-      /   .subcategory{ :id => subcategory }
-      /     = subvalue
+= haml :vcard, :locals => { :name => @cv.name, :contact_details => @cv["contact"] } if @cv["contact"]
+
+= Vitae::Nodes::BaseNode.new(@cv.except(%w[vitae_config contact]))
+
 %br
 %br
-=link_to "Vitae Home", "/"
+- unless CV.size==1
+  = link_to "Vitae Home", "/"

data/lib/vitae/server/views/vcard.haml

@@ -1,8 +1,8 @@
 .vcard
-  %h1#title.fn= @cv.name
+  %h1#title.fn= name
   
   %ul#quick-links
-    - @cv["contact"].each do |key, value|
+    - contact_details.each do |key, value|
       - case value
       - when /^https?:\/\//
         %li

data/lib/vitae/templates/config.ru

@@ -0,0 +1,6 @@
+require "vitae"
+require "vitae/server/server"
+
+Vitae::project_root = File.expand_path(File.dirname(__FILE__))
+
+run Server

data/lib/vitae/templates/cvs/arthur_gunn.yaml

@@ -19,4 +19,49 @@
         - postal-code: 9016
     - phones: !omap
         - home: (03) 477 99 44
-        - mobile: 027 477 7723
+        - mobile: 027 477 7723
+
+- In Short:
+    Live in Dunedin, NZ. Program a bit.
+    
+- Projects: !omap
+    - Vitae:
+        start: 2010-12-01
+        description: A structured CV publishing system, specifically the one used to generate and very likely serve this CV.
+        role: Designer and programmer.
+    - Mewzet.com:
+        start: 2009-01-01
+        url: http://mewzet.com
+        description: A web application to teach music theory online.
+        role: Co-founder, designer and programmer.
+    - GunnMap:
+        start: 2007-06-01
+        end: 2008-01-01
+        url: http://gunn.co.nz/map
+        description: A system to help wikipedia contributors very easily create maps of country level demographics. Wikimedia has a <a href="http://commons.wikimedia.org/wiki/Category:Maps_generated_with_GunnMap">list</a> of some of the generated maps.
+        role: Designer and programmer
+    - AstroTour:
+        start: 2006-01-01
+        end: 2007-12-30
+        url: http://gunn.co.nz/astrotour
+        description: An interactive, customisble, scriptable, 3D, in browser simulation of the solar system.
+        role: Designer and programmer
+
+- Expertise:
+    Ruby: prefer strong
+    Rails: prefer strong
+    Sinatra: prefer strong
+    Flash: prefer strong
+    Flex: prefer strong
+    ActionScript: prefer strong
+    Javascript: prefer
+    Jquery: prefer
+    CSS: weak
+    rspec: weak
+    html:
+    haml: prefer strong
+    sass: prefer weak
+    mysql: prefer
+    RR: prefer
+    Test::Unit: prefer strong
+    <em>shoulda</em>: prefer

data/lib/vitae/templates/themes/default/application.css

@@ -58,12 +58,15 @@ ul {
   font-family: "Courier New", Courier, monospace;
   margin-top: 0;
   margin-bottom: 2em;
+	padding-right: 0.5em;
+	padding-left: 1em;
 }
 
 .tags li {
   display: inline;
   margin-right: 0.5em;
   vertical-align: middle;
+  white-space: nowrap;
 }
 
 .tags li {
@@ -110,12 +113,17 @@ ul {
 #quick-links {
   list-style-type: none;
   padding-left: 0.5em;
-  width: 25em;
+  width: 21em;
   margin: 2em auto;
   color: #666;
   font-size: 0.9em;
 }
 
+ul#quick-links li {
+  padding: 0;
+  margin-bottom: 0;
+}
+
 #quick-links li a {
   text-decoration: none;
   font-size: 1.1em;
@@ -132,7 +140,7 @@ ul {
 
 #quick-links li span.adr {
 	display: inline-block;
-	width: 15em;
+	width: 12em;
 }
 
 #quick-links li a:hover, #quick-links li a:focus {
@@ -185,7 +193,7 @@ em {
   margin-bottom: 2em;
 }
 
-.jobs-list li {
+li {
   padding: 0.75em 0.5em 0.75em 1em;
   margin-bottom: 1em;
 }
@@ -207,7 +215,7 @@ em {
 
 
 
-#summarize { color: #555; position: absolute; top: 1em; right: 1em; width: 10em; }
+#summarise { color: #555; position: absolute; top: 1em; right: 1em; width: 10em; }
 
 #projects-contributed-to { margin-left: 1em; }
 #projects-contributed-to li { display: inline; margin-right: 0.5em; line-height: 1.5; }

data/lib/vitae/templates/themes/default/application.js

@@ -1 +1,148 @@
-// I'm javascript!
+// emile.js (c) 2009 Thomas Fuchs
+// Licensed under the terms of the MIT license.
+(function(k,b){var o=document.createElement("div"),l=("backgroundColor borderBottomColor borderBottomWidth borderLeftColor borderLeftWidth borderRightColor borderRightWidth borderSpacing borderTopColor borderTopWidth bottom color fontSize fontWeight height left letterSpacing lineHeight marginBottom marginLeft marginRight marginTop maxHeight maxWidth minHeight minWidth opacity outlineColor outlineOffset outlineWidth paddingBottom paddingLeft paddingRight paddingTop right textIndent top width wordSpacing zIndex").split(" "),m=typeof o.style.opacity=="string",f=typeof o.style.filter=="string",n=document.defaultView,a=n&&typeof n.getComputedStyle!=="undefined",h=/alpha\s*\(\s*opacity\s*=\s*([^\)]+)\)/,c=function(){},i=function(){return"1"};if(m){c=function(q,r){q.style.opacity=r};i=function(q){return q.opacity}}else{if(f){c=function(q,r){var s=q.style;if(q.currentStyle&&!q.currentStyle.hasLayout){s.zoom=1}if(h.test(s.filter)){r=r>=0.9999?"":("alpha(opacity="+(r*100)+")");s.filter=s.filter.replace(h,r)}else{s.filter+=" alpha(opacity="+(r*100)+")"}};i=function(r){var q=r.filter.match(h);return(q?(q[1]/100):1)+""}}}function j(q,r,s){return(q+(r-q)*s).toFixed(3)}function p(r,q,s){return r.substr(q,s||1)}function e(s,x,z){var u=2,t,y,w,A=[],q=[];while(t=3,y=arguments[u-1],u--){if(p(y,0)=="r"){y=y.match(/\d+/g);while(t--){A.push(~~y[t])}}else{if(y.length==4){y="#"+p(y,1)+p(y,1)+p(y,2)+p(y,2)+p(y,3)+p(y,3)}while(t--){A.push(parseInt(p(y,1+t*2,2),16))}}}while(t--){w=~~(A[t+3]+(A[t]-A[t+3])*z);q.push(w<0?0:w>255?255:w)}return"rgb("+q.join(",")+")"}function d(t){var s=parseFloat(t),r=t.replace(/^[\-\d\.]+/,"");return isNaN(s)?{v:r,f:e,u:""}:{v:s,f:j,u:r}}function g(t){var s,u={},r=l.length,q;o.innerHTML='<div style="'+t+'"></div>';s=o.childNodes[0].style;while(r--){if(q=s[l[r]]){u[l[r]]=d(q)}}return u}b[k]=function(w,t,q){w=typeof w=="string"?document.getElementById(w):w;q=q||{};var z=g(t),y=a?n.getComputedStyle(w,null):w.currentStyle,s,A={},u=+new Date,r=q.duration||200,C=u+r,v,B=q.easing||function(D){return(-Math.cos(D*Math.PI)/2)+0.5},x;for(s in z){A[s]=d(s==="opacity"?i(y):y[s])}v=setInterval(function(){var D=+new Date,E=D>C?1:(D-u)/r;for(s in z){x=z[s].f(A[s].v,z[s].v,B(E))+z[s].u;if(s==="opacity"){c(w,x)}else{w.style[s]=x}}if(D>C){clearInterval(v);q.after&&q.after()}},10)}})("emile",this);
+
+/* Following JS by Maxim Chernyak and Juriy Zaytsev - https://github.com/maxim/maxim.github.com */
+
+(function(){
+  function byId(id) {
+    return (typeof id === 'string' ? document.getElementById(id) : id);
+  }
+  function removeEl(el) {
+    el.parentNode.removeChild(el);
+  }
+  function setElStyles(el, styles) {
+    for (var name in styles) {
+      el.style[name] = styles[name];
+    }
+  }
+  var getComputedStyle = function(el) { return el.style; }, 
+      view = document.defaultView;
+  if (view && view.getComputedStyle) {
+    getComputedStyle = function(el){ return view.getComputedStyle(el, ''); };
+  }
+  else if (document.documentElement.currentStyle) {
+    getComputedStyle = function(el){ return el.currentStyle; };
+  }
+  function getOffset(el, direction) {
+    var offsetProp = 'offset' + (direction.charAt(0).toUpperCase() + direction.slice(1)),
+        offsetValue = el[offsetProp],
+        cs;
+    while ((el = el.offsetParent) && (cs = getComputedStyle(el))) {
+      offsetValue += el[offsetProp];
+    }
+    return offsetValue;
+  }
+  
+  var summaryEls = [ ];
+  function absolutizeSummaryEls() {
+    var emEls = document.getElementsByTagName('em');
+    for (var i = 0, len = emEls.length; i < len; i++) {
+      var left = getOffset(emEls[i], 'left'),
+          top = getOffset(emEls[i], 'top'),
+          clone = emEls[i].cloneNode(true);
+      setElStyles(clone, {
+        position: 'absolute',
+        left: left + 'px',
+        top: top + 'px'
+      });
+      document.body.appendChild(clone);
+      summaryEls.push(clone);
+    }
+    var titleEl = byId('title');
+    var titleClone = titleEl.cloneNode(true);
+    setElStyles(titleClone, {
+      position: 'absolute',
+      left: getOffset(titleEl, 'left') + 'px',
+      top: getOffset(titleEl, 'top') + 'px',
+      width: titleEl.offsetWidth + 'px',
+      margin: 0
+    });
+    titleClone.id = 'title-clone';
+    document.body.appendChild(titleClone);
+  }
+  
+  function centerElementAt(element, top) {
+    element.style.left = '50%';
+    element.style.marginLeft = -(element.offsetWidth / 2) + 'px';
+    emile(element, 'top:' + top + 'px', { duration: 500 });
+  }
+  
+  function showSummaryEls() {
+    var top = 130, animationInterval = 100;
+    emile('content', 'opacity:0', {
+      duration: 500,
+      after: function(){
+        setTimeout(function() {
+          if (summaryEls.length) {
+            top += 30;
+            centerElementAt(summaryEls.shift(), top);
+            setTimeout(arguments.callee, animationInterval);
+          }
+          else {
+            summarizeBtn.disabled = false;
+          }
+        }, animationInterval);
+      }
+    });
+  }
+  
+  function removeSummaryEls() {
+    var ems = [ ];
+    for (var i = 0, els = document.body.childNodes, len = els.length; i < len; i++) {
+      if (els[i].tagName === 'EM') {
+        ems.push(els[i]);
+      }
+    }
+    (function(){
+      if (ems.length) {
+        var el = ems.shift();
+        emile(el, 'left:-500px', { 
+          after: (function(el){
+            return function() {
+              removeEl(el);
+            };
+          })(el)
+        });
+        setTimeout(arguments.callee, 50);
+      }
+    })();
+  }
+  
+  var summarizeBtn = byId('summarise');
+  var isSummarized = false;
+  
+  function hideSummary() {
+    summarizeBtn.disabled = true;
+    isSummarized = false;
+    summarizeBtn.innerHTML = 'Summarise!';
+    removeSummaryEls();
+    removeEl(byId('title-clone'));
+    setTimeout(function(){
+      emile('content', 'opacity:1', {
+        duration: 500,
+        after: function(){
+          summarizeBtn.disabled = false
+        }
+      });
+    }, 700);
+  }
+  
+  function showSummary() {
+    summarizeBtn.disabled = true;
+    isSummarized = true;
+    summarizeBtn.innerHTML = 'Show content';
+    absolutizeSummaryEls();
+    showSummaryEls();
+  }
+  
+  summarizeBtn.style.display = '';
+  summarizeBtn.onclick = function() {
+    if (isSummarized) {
+      hideSummary();
+    }
+    else {
+      showSummary();
+    }
+  };
+})();

data/lib/vitae/version.rb

@@ -1,3 +1,3 @@
 module Vitae
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/active_server_test.rb

@@ -9,6 +9,7 @@ class ActiveServerTest < VitaeServerTestCase
       assert last_response.ok?
       assert_matches %w[Katya Derek Arthur Zeena]
       assert_select  "a[href='/katya']", "Katya"
+      assert_select  "a[href='/zeena']", "Zeena"
       
       check_includes_standard_assets
     end
@@ -20,7 +21,6 @@ class ActiveServerTest < VitaeServerTestCase
       assert last_response.ok?
     
       assert_select "h1", "Sajal Shah"
-      assert_select "a[href='/']"
     
       check_includes_standard_assets
     end
@@ -35,6 +35,18 @@ class ActiveServerTest < VitaeServerTestCase
     end
   end
   
+  test "if there's only one CV it should be at the root" do
+    with_project :sals do
+      get '/'
+      assert last_response.ok?
+    
+      assert_select "h1", "Sajal Shah"
+      assert_no_select "a[href='/']"
+    
+      check_includes_standard_assets
+    end
+  end
+  
   def check_includes_standard_assets theme="default"
     assert_select "script[src='/#{theme}/application.js'][type='text/javascript']"
     assert_select "link[href='/#{theme}/application.css'][rel='stylesheet'][type='text/css']"

data/test/test_helper.rb

@@ -30,6 +30,7 @@ class VitaeTestCase < Test::Unit::TestCase
   
   def vitae_test_dir
     FileUtils.mkdir_p @@vitae_test_dir
+    @@vitae_test_dir
   end
   
   def vitae_executable

data/test/vitae_executable_test.rb

@@ -6,9 +6,12 @@ class VitaeExecutableTest < VitaeTestCase
     clear_test_dir
     output = vitae_create("my_cvs")
     
-    files = %w[my_cvs/cvs/arthur_gunn.yaml
+    files = %w[
+      my_cvs/config.ru
+      my_cvs/cvs/arthur_gunn.yaml
       my_cvs/themes/default/application.js
-      my_cvs/themes/default/application.css]
+      my_cvs/themes/default/application.css
+    ]
     
     files.each do |file|
       assert(vitae_file?( file ), "#{file} should exist in #{vitae_test_dir}")

data/vitae.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["arthur@gunn.co.nz"]
   s.homepage    = "https://github.com/gunn/vitae"
   s.summary     = %q{A structured CV publishing system.}
-  s.description = %q{Vitae is to CVs what rubygems is to ruby code. Still very under development.}
+  s.description = %q{Vitae is to CVs what rubygems is to ruby code. Still very under development. Semi-usable at this point.}
   
   s.add_dependency "sinatra", "~>1.1.0"
   s.add_dependency "haml", "~>3.0.0"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vitae
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Arthur Gunn
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +13:00
+date: 2010-12-20 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 0
         - 14
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -82,7 +77,7 @@ dependencies:
         version: 1.4.0
   type: :development
   version_requirements: *id004
-description: Vitae is to CVs what rubygems is to ruby code. Still very under development.
+description: Vitae is to CVs what rubygems is to ruby code. Still very under development. Semi-usable at this point.
 email: 
 - arthur@gunn.co.nz
 executables: 
@@ -92,26 +87,27 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .autotest
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - bin/vitae
-- config.ru
 - lib/vitae.rb
 - lib/vitae/cli.rb
 - lib/vitae/cv.rb
+- lib/vitae/delegators.rb
 - lib/vitae/ordered_hash.rb
 - lib/vitae/server/.gitignore
 - lib/vitae/server/assets/favicon.ico
+- lib/vitae/server/assets/favicon.psd
 - lib/vitae/server/helpers.rb
+- lib/vitae/server/node.rb
 - lib/vitae/server/server.rb
 - lib/vitae/server/views/index.haml
 - lib/vitae/server/views/layout.haml
 - lib/vitae/server/views/show.haml
 - lib/vitae/server/views/vcard.haml
+- lib/vitae/templates/config.ru
 - lib/vitae/templates/cvs/arthur_gunn.yaml
 - lib/vitae/templates/cvs/default.yaml.tt
 - lib/vitae/templates/themes/default/application.css
@@ -139,7 +135,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -148,7 +143,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.autotest

@@ -1,10 +0,0 @@
-require 'autotest/restart'
-require 'autotest/fsevent'
-require 'redgreen/autotest'
-
-Autotest.add_hook(:initialize) do |at|
-  at.clear_mappings
-  at.add_mapping(/.*/) do |filename, _|
-    Dir.glob('test/*.rb')
-  end
-end

data/Gemfile.lock

@@ -1,29 +0,0 @@
-PATH
-  remote: .
-  specs:
-    vitae (0.0.2)
-      haml
-      sinatra
-      thor
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    haml (3.0.24)
-    nokogiri (1.4.4)
-    rack (1.2.1)
-    sinatra (1.1.0)
-      rack (~> 1.1)
-      tilt (~> 1.1)
-    thor (0.14.6)
-    tilt (1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  haml
-  nokogiri
-  sinatra
-  thor
-  vitae!

data/config.ru

@@ -1,4 +0,0 @@
-require File.expand_path('../lib/vitae', __FILE__)
-require "vitae/server/server"
-
-run Server