vitae 0.1.1 → 0.1.2

data/README.rdoc

@@ -22,12 +22,12 @@ Great, it's created our two named CVs in the my_cv_project/cvs directory from a
 Once your done editing, start up the server:
   $: cd my_cv_project
   $: vitae server
-    Serving CVs at 0.0.0.0:3141
+    Serving 2 CVs at http://0.0.0.0:3141/ from my_cv_project
 
 Enjoy!
 
 === Future plans
-1. Data should actually be read from the yaml files.
+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

data/bin/vitae

@@ -1,67 +1,5 @@
 #!/usr/bin/env ruby
-require "rubygems"
-require "thor"
-
 require File.expand_path('../../lib/vitae', __FILE__)
-
-module Vitae
-  class CLI < Thor
-    include Thor::Actions
-    
-    def self.source_root
-      File.expand_path('../../lib/vitae/templates', __FILE__)
-    end
-    
-    
-    default_task :create
-
-    desc "create [project_name]", "Create a new vitae project"
-    def create(name, *cv_names)
-      self.destination_root = name
-      puts "creating #{name}..."
-      
-      if cv_names.size > 0
-        cv_names.each do |cv_name|
-          @name = cv_name
-          template "cvs/default.yaml.tt", "cvs/#{cv_name}.yaml"
-        end
-      else
-        templates = Dir.glob(File.join(CLI.source_root, "cvs/*.yaml*")).
-                        map{|f| File.basename(f)} -["default.yaml.tt"]
-        
-        templates.each do |template_name|
-          template "cvs/#{template_name}", "cvs/#{template_name.sub(/\.tt$/, '')}"
-        end
-      end
-      
-      themes = Dir.glob(File.join(CLI.source_root, "themes/*")).map{|f| File.basename(f)}            
-      themes.each do |theme_name|
-        copy_file "themes/#{theme_name}/application.js"
-        copy_file "themes/#{theme_name}/application.css"
-      end
-      
-    end
-
-    desc "server [-p 3000]", "Start the vitae server."
-    def server
-      require "rack"
-    
-      just_pretend = ARGV.delete "--pretend"
-      port_set_by_user = ARGV.any? { |a| %w[-p --port].include?( a ) }
-    
-      server = Rack::Server.new.tap do |s|
-        s.options[:config]  = File.join(File.dirname(__FILE__), "../config.ru")
-        s.options[:Port]    = 3141 unless port_set_by_user
-      end
-      
-      require "vitae/server/server"
-      Server.project_root = Dir.pwd
-      
-      say "Serving CVs at #{server.options[:Host]}:#{server.options[:Port]}", :green
-      server.start unless just_pretend
-    end
-
-  end
-end
+require "vitae/cli"
 
 Vitae::CLI.start

data/lib/vitae.rb

@@ -1,2 +1,26 @@
 $:.unshift File.dirname(File.expand_path(__FILE__))
-require "vitae/cv"
+require "vitae/cv"
+require "vitae/ordered_hash"
+
+module Vitae
+  @@project_root = nil
+  def self.project_root
+    @@project_root
+  end
+  
+  def self.project_root= root
+    Server.set :public, File.join(root, "themes") if root && defined?(Server)
+    @@project_root = root
+  end
+  
+  module OrderedHashExtensions
+    def except(exceptions=[])
+      reject do |k, v|
+        exceptions.include? k
+      end
+    end
+  end
+  
+end
+
+Hash.send :include, Vitae::OrderedHashExtensions

data/lib/vitae/cli.rb

@@ -0,0 +1,69 @@
+require "rubygems"
+require "thor"
+
+module Vitae
+  class CLI < Thor
+    include Thor::Actions
+    
+    def self.source_root
+      File.expand_path('templates', File.dirname(__FILE__))
+    end
+    
+    
+    default_task :create
+
+    desc "create [project_name]", "Create a new vitae project"
+    def create(name, *cv_names)
+      self.destination_root = name
+      puts "creating #{name}..."
+      
+      if cv_names.size > 0
+        cv_names.each do |cv_name|
+          @name = cv_name
+          @human_name = cv_name.split(/[^a-z]+/i).map{|w|w.capitalize}.join(" ")
+          @url_name = @name.gsub(/[^a-z\-]+/i, "-")
+          template "cvs/default.yaml.tt", "cvs/#{cv_name}.yaml"
+        end
+      else
+        templates = Dir.glob(File.join(CLI.source_root, "cvs/*.yaml*")).
+                        map{|f| File.basename(f)} -["default.yaml.tt"]
+        
+        templates.each do |template_name|
+          template "cvs/#{template_name}", "cvs/#{template_name.sub(/\.tt$/, '')}"
+        end
+      end
+      
+      themes = Dir.glob(File.join(CLI.source_root, "themes/*")).map{|f| File.basename(f)}            
+      themes.each do |theme_name|
+        copy_file "themes/#{theme_name}/application.js"
+        copy_file "themes/#{theme_name}/application.css"
+      end
+      
+    end
+
+    desc "server [-p 3000]", "Start the vitae server."
+    def server(project_path=".")
+      require "rack"
+      just_pretend = ARGV.delete "--pretend"
+      
+      port_set_by_user = ARGV.any? { |a| %w[-p --port].include?( a ) }
+      
+      server = Rack::Server.new.tap do |s|
+        s.options[:config]  = File.join(File.dirname(__FILE__), "..", "..", "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
+      cvs = "#{cv_count} CV#{'s' unless cv_count==1}"
+      project_dir_name = File.basename(Vitae::project_root)
+      
+      say "Serving #{cvs} at http://#{opts[:Host]}:#{opts[:Port]}/ from #{project_dir_name}\n", :green
+      server.start unless just_pretend
+    end
+    
+  end
+end

data/lib/vitae/cv.rb

@@ -1,40 +1,79 @@
+require "yaml"
+
 class CV
+  attr_reader :file_name
   
-  def self.all
-    cvs = Dir.glob(File.join(Server.project_root, "cvs/*.yaml"))
-    cvs.map do |cv|
-      CV.new(cv)
+  class << self
+    def all
+      raise "Vitae::project_root is not set" unless Vitae::project_root
+      cvs = Dir.glob(File.join(Vitae::project_root, "cvs/*.yaml"))
+      cvs.map do |cv|
+        CV.new(cv)
+      end
     end
-  end
-  
-  def self.find name
-    all.find do |cv|
-      cv.name == name
+
+    def find file_name
+      all.find do |cv|
+        cv.file_name == file_name
+      end
+    end
+    
+    def first
+      all.first
+    end
+    
+    def last
+      all.last
     end
   end
   
   def initialize yaml_file
-    @name = File.basename(yaml_file, '.yaml')
+    @yaml_file = yaml_file
+    @file_name = File.basename(yaml_file, '.yaml')
   end
   
+  
   def name
-    @name
+    @name ||=  data_hash.delete("name")
   end
   
-  def human_name
-    name.split("_").map{|w|w.capitalize}.join(" ")
+  def vitae_config
+    @vitae_config ||=  data_hash.delete("vitae_config")
   end
   
-  def to_s
-    human_name
+  def data_hash
+    @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
-    "/#{name}"
+    "/#{file_name}"
   end
   
   def theme
     "default"
   end
   
+  def to_s
+    name
+  end
+  
+  # def method_missing name, *args, &block
+  #   data.send name, *args, &block
+  # end
+  
 end

data/lib/vitae/ordered_hash.rb

@@ -0,0 +1,188 @@
+require 'yaml'
+
+YAML.add_builtin_type("omap") do |type, val|
+  ActiveSupport::OrderedHash[val.map(&:to_a).map(&:first)]
+end
+
+module 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>
+  # implements a hash that preserves insertion order, as in Ruby 1.9:
+  #
+  #   oh = ActiveSupport::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.
+  class OrderedHash < ::Hash #:nodoc:
+    def to_yaml_type
+      "!tag:yaml.org,2002:omap"
+    end
+
+    def to_yaml(opts = {})
+      YAML.quick_emit(self, opts) do |out|
+        out.seq(taguri, to_yaml_style) do |seq|
+          each do |k, v|
+            seq.add(k => v)
+          end
+        end
+      end
+    end
+
+    # Hash is ordered in Ruby 1.9!
+    if RUBY_VERSION < '1.9'
+
+      # In MRI the Hash class is core and written in C. In particular, methods are
+      # programmed with explicit C function calls and polymorphism is not honored.
+      #
+      # For example, []= is crucial in this implementation to maintain the @keys
+      # array but hash.c invokes rb_hash_aset() originally. This prevents method
+      # reuse through inheritance and forces us to reimplement stuff.
+      #
+      # For instance, we cannot use the inherited #merge! because albeit the algorithm
+      # itself would work, our []= is not being called at all by the C code.
+
+      def initialize(*args, &block)
+        super
+        @keys = []
+      end
+
+      def self.[](*args)
+        ordered_hash = new
+
+        if (args.length == 1 && args.first.is_a?(Array))
+          args.first.each do |key_value_pair|
+            next unless (key_value_pair.is_a?(Array))
+            ordered_hash[key_value_pair[0]] = key_value_pair[1]
+          end
+
+          return ordered_hash
+        end
+
+        unless (args.size % 2 == 0)
+          raise ArgumentError.new("odd number of arguments for Hash")
+        end
+
+        args.each_with_index do |val, ind|
+          next if (ind % 2 != 0)
+          ordered_hash[val] = args[ind + 1]
+        end
+
+        ordered_hash
+      end
+
+      def initialize_copy(other)
+        super
+        # make a deep copy of keys
+        @keys = other.keys
+      end
+
+      def []=(key, value)
+        @keys << key unless has_key?(key)
+        super
+      end
+
+      def delete(key)
+        if has_key? key
+          index = @keys.index(key)
+          @keys.delete_at index
+        end
+        super
+      end
+
+      def delete_if
+        super
+        sync_keys!
+        self
+      end
+
+      def reject!
+        super
+        sync_keys!
+        self
+      end
+
+      def reject(&block)
+        dup.reject!(&block)
+      end
+
+      def keys
+        @keys.dup
+      end
+
+      def values
+        @keys.collect { |key| self[key] }
+      end
+
+      def to_hash
+        self
+      end
+
+      def to_a
+        @keys.map { |key| [ key, self[key] ] }
+      end
+
+      def each_key
+        @keys.each { |key| yield key }
+      end
+
+      def each_value
+        @keys.each { |key| yield self[key]}
+      end
+
+      def each
+        @keys.each {|key| yield [key, self[key]]}
+      end
+
+      alias_method :each_pair, :each
+
+      def clear
+        super
+        @keys.clear
+        self
+      end
+
+      def shift
+        k = @keys.first
+        v = delete(k)
+        [k, v]
+      end
+
+      def merge!(other_hash)
+        if block_given?
+          other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
+        else
+          other_hash.each { |k, v| self[k] = v }
+        end
+        self
+      end
+
+      alias_method :update, :merge!
+
+      def merge(other_hash, &block)
+        dup.merge!(other_hash, &block)
+      end
+
+      # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+      def replace(other)
+        super
+        @keys = other.keys
+        self
+      end
+
+      def invert
+        OrderedHash[self.to_a.map!{|key_value_pair| key_value_pair.reverse}]
+      end
+
+      def inspect
+        "#<OrderedHash #{super}>"
+      end
+
+      private
+        def sync_keys!
+          @keys.delete_if {|k| !has_key?(k)}
+        end
+    end
+  end
+end

data/lib/vitae/server/helpers.rb

@@ -9,8 +9,9 @@ module Helpers
     html
   end
   
-  def link_to(text, link=nil, options={})
-    link ||= text.split(/\s+/).join('_').downcase
+  def link_to(text, *args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    link = args.first || text.split(/\s+/).join('_').downcase
     content_tag :a, text, options.merge({:href => link})
   end
   

data/lib/vitae/server/server.rb

@@ -5,27 +5,20 @@ require "vitae/server/helpers"
 class Server < Sinatra::Base
   helpers Helpers
   set :views, File.dirname(__FILE__) + '/views'
+  set :public, File.join(Vitae::project_root, "themes") rescue ''
   
   get '/' do
     @cvs = CV.all
     haml :index
   end
   
+  get "/favicon.ico" do
+    send_file File.join(File.dirname(__FILE__), "assets", "favicon.ico"), :type => 'image/x-icon', :disposition => 'inline'
+  end
+  
   get '/:name' do
     @cv = CV.find( params[:name] )
     haml :show
   end
   
-  
-  
-  @@project_root = nil
-  def self.project_root
-    @@project_root
-  end
-  
-  def self.project_root= root
-    set :public, File.join(root, "themes")
-    @@project_root = root
-  end
-  
 end

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

@@ -1,3 +1,5 @@
+%h1#title Vitae
 %ul
   - @cvs.each do |cv|
-    %li= link_to cv.human_name, cv.link
+    %li
+      %h2= link_to cv.name, cv.link

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

@@ -1,10 +1,8 @@
 !!! 5
 %html
   %head
-    %title Vitae #{ @cv && ": "+ @cv.human_name }
+    %title Vitae #{ @cv && ": "+ @cv.name }
     = include_theme_assets
   %body
-    #header
-      %h1#title= @cv && @cv.human_name || "Vitae"
     #content
       = yield

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

@@ -1 +1,21 @@
+= 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
+%br
+%br
 =link_to "Vitae Home", "/"

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

@@ -0,0 +1,39 @@
+.vcard
+  %h1#title.fn= @cv.name
+  
+  %ul#quick-links
+    - @cv["contact"].each do |key, value|
+      - case value
+      - when /^https?:\/\//
+        %li
+          %span.label= key
+          = link_to value.sub(/^https?:\/\//, ''), value, :class => "url"
+      - when Hash
+        - case key
+        - when "phones"
+          - value.each do |phone, number|          
+            %li.tel
+              %span.label.type= phone
+              %span.value= number
+        - when "address"
+          %li
+            %span.label= key
+            %span.adr
+              - value.each_with_index do |(address_field, address_value), i|
+                = succeed "#{', ' if i<value.size-1}" do
+                  %span{:class => address_field}= address_value
+      - else
+        - case key
+        - when "nickname"
+          %li.nick
+            %span.label= key
+            %span.fn.nickname= value
+        - when /e-?mail/
+          %li
+            %span.label= key
+            - mailto_less = value.sub(/^mailto:/, '')
+            = link_to mailto_less, "mailto:#{mailto_less}", :class => "email"
+        - else
+          %li
+            %span.label= key
+            = value

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

@@ -1,5 +1,22 @@
-name: Arthur Gunn
+--- !omap
+- name: Arthur Gunn
 
-contact:
-  homepage: http://arthurgunn.com
-  email: arthur@gunn.co.nz
+- vitae_config: !omap
+    - email: arthur@gunn.co.nz
+    - crypted_password: d7f42977c55e23fc92e4190c6adc07862a572879
+    - password_salt: 8f7a8cf04f4e
+
+- contact: !omap
+    - nickname: Arthur
+    - e-mail: mailto:arthur@gunn.co.nz
+    - homepage: http://arthurgunn.com
+    - github: https://github.com/gunn
+    - address: !omap
+        - street-address: 96 London St.
+        - locality: City Rise
+        - region: Otago
+        - country-name: New Zealand
+        - postal-code: 9016
+    - phones: !omap
+        - home: (03) 477 99 44
+        - mobile: 027 477 7723

data/lib/vitae/templates/cvs/default.yaml.tt

@@ -1,5 +1,11 @@
-name: <%= @name %>
+--- !omap
+- name: <%= @human_name %>
 
-contact:
-  homepage: http://<%= @name %>.me/
-  email: <%= @name %>@gmail.com
+- vitae_config: !omap
+    - email: <%= @url_name %>@gmail.com
+    - crypted_password: d7f42977c55e23fc92e4190c6adc07862a572879
+    - password_salt: 8f7a8cf04f4e
+
+- contact: !omap
+    - email: <%= @url_name %>@gmail.com
+    - homepage: http://<%= @url_name %>.me/

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

@@ -127,6 +127,12 @@ ul {
   width: 6em;
   padding-right: 1em;
   text-align: right;
+	vertical-align: top;
+}
+
+#quick-links li span.adr {
+	display: inline-block;
+	width: 15em;
 }
 
 #quick-links li a:hover, #quick-links li a:focus {
@@ -193,6 +199,14 @@ em {
   color: #333;
 }
 
+
+
+.nick {
+	display: none;
+}
+
+
+
 #summarize { color: #555; position: absolute; top: 1em; right: 1em; width: 10em; }
 
 #projects-contributed-to { margin-left: 1em; }

data/lib/vitae/version.rb

@@ -1,3 +1,3 @@
 module Vitae
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/active_server_test.rb

@@ -4,28 +4,35 @@ require "nokogiri"
 class ActiveServerTest < VitaeServerTestCase
 
   test "the homepage contains lists the cvs we're hosting" do
-    clear_test_dir
-    vitae_create "resumes derek arthur sajal"
-    
-    get '/'
-    assert last_response.ok?
-    assert_matches %w[Derek Arthur Sajal]
-    assert_select  "a[href='/sajal']", "Sajal"
-    
-    check_includes_standard_assets
+    with_project :dkaz do
+      get '/'
+      assert last_response.ok?
+      assert_matches %w[Katya Derek Arthur Zeena]
+      assert_select  "a[href='/katya']", "Katya"
+      
+      check_includes_standard_assets
+    end
   end
   
   test "a CV gets its own show page" do
-    clear_test_dir
-    vitae_create "resumes arthur_gunn"
+    with_project :sals do
+      get '/sajal_shah'
+      assert last_response.ok?
     
-    get '/arthur_gunn'
-    assert last_response.ok?
+      assert_select "h1", "Sajal Shah"
+      assert_select "a[href='/']"
     
-    assert_select "h1", "Arthur Gunn"
-    assert_select "a[href='/']"
+      check_includes_standard_assets
+    end
+  end
+  
+  test "a CV doesn't mindlessly blat out converted yaml data" do
+    with_project :default do
+      get '/arthur_gunn'
+      assert last_response.ok?
     
-    check_includes_standard_assets
+      assert_no_select "h2", "vitae_config"
+    end
   end
   
   def check_includes_standard_assets theme="default"

data/test/cv_format_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+require "nokogiri"
+
+class CvFormatTest < VitaeServerTestCase
+  
+  test "a CV has a well formatted vcard" do
+    with_project :default do
+      get '/arthur_gunn'
+      assert last_response.ok?
+    
+      assert_select ".vcard" do
+        assert_select "h1#title.fn", "Arthur Gunn"
+        assert_select "ul#quick-links li" do
+          assert_select "span.label", "github"
+          assert_select "a.url[href='https://github.com/gunn']", "github"
+          assert_select "span.label", "e-mail"
+          assert_select "a.email[href='mailto:arthur@gunn.co.nz']", "arthur@gunn.co.nz"
+        end
+        assert_select "span.adr" do
+          assert_select "span.street-address", "96 London St."
+          assert_select "span.postal-code", "9016"
+        end
+      end
+      
+    end
+  end
+  
+end

data/test/test_helper.rb

@@ -1,12 +1,13 @@
 require 'fileutils'
 require 'test/unit'
+require "stringio"
 
-require File.expand_path('../../lib/vitae', __FILE__)
-require 'vitae/server/server'
+require 'rubygems'
 require 'rack/test'
 
-VITAE_TEST_DIR   = ::File.expand_path('../../tmp', __FILE__)
-VITAE_EXECUTABLE = ::File.expand_path('../../bin/vitae', __FILE__)
+require File.expand_path('../../lib/vitae', __FILE__)
+require 'vitae/server/server'
+require "vitae/cli"
 
 class VitaeTestCase < Test::Unit::TestCase
   def self.test name, &block
@@ -14,31 +15,65 @@ class VitaeTestCase < Test::Unit::TestCase
     define_method name, &block
   end
   
+  @@projects = {
+    :default => "",
+    :sals => "sajal_shah",
+    :dkaz => "derek katya arthur zeena"
+  }
+  
+  @@vitae_test_dir   = File.expand_path('../../tmp', __FILE__)
+  @@vitae_executable = File.expand_path('../../bin/vitae', __FILE__)
+  
   test "tests working here" do
     # assert(true, "Just to keep t/u happy.")
   end
   
   def vitae_test_dir
-    FileUtils.mkdir_p VITAE_TEST_DIR
+    FileUtils.mkdir_p @@vitae_test_dir
   end
   
   def vitae_executable
-    VITAE_EXECUTABLE
+    @@vitae_executable
   end
   
-  %w[server].each do |command|
-    define_method "vitae_#{command}" do |*args|
-      args = args.first
-      FileUtils.cd vitae_test_dir
-      `#{vitae_executable} #{command} #{args} 2>&1`
-    end
+  def vitae_server args=""
+    cli = Vitae::CLI.new
+    real_argv = ARGV
+    ARGV.replace(args.split(/\s+/))
+    get_stdout_and_stderr { cli.server }
+  ensure
+    ARGV.replace(real_argv)
   end
   
   def vitae_create args=""
     FileUtils.cd vitae_test_dir
-    project_name = args.split(/\s+/).first || ""
-    Server.project_root = File.join(vitae_test_dir, project_name)
-    `#{vitae_executable} create #{args} 2>&1`
+    cli = Vitae::CLI.new
+    args = args.split(/\s+/)
+    project_name = args.first || ""
+    Vitae::project_root = File.join(vitae_test_dir, project_name)
+    
+    get_stdout_and_stderr { cli.create(*args) }
+  end
+  
+  def with_project name, &block
+    project_dir = File.join(vitae_test_dir, name.to_s)
+    vitae_create "#{project_dir} #{@@projects[name]}" if !File.exist?( project_dir )
+    Vitae::project_root = project_dir
+    FileUtils.cd project_dir
+    yield
+  ensure
+    Vitae::project_root = ''
+  end
+  
+  def get_stdout_and_stderr &block
+    new_out = StringIO.new
+    real_stdout, $stdout = $stdout, new_out
+    real_stderr, $stderr = $stderr, new_out
+    yield
+    new_out.string
+  ensure
+    $stderr = real_stderr
+    $stdout = real_stdout
   end
   
   def clear_test_dir
@@ -46,7 +81,7 @@ class VitaeTestCase < Test::Unit::TestCase
   end
   
   def vitae_file? path
-    File.exist? ::File.expand_path(path, vitae_test_dir)
+    File.exist? File.expand_path(path, vitae_test_dir)
   end
   
 end
@@ -64,15 +99,43 @@ class VitaeServerTestCase < VitaeTestCase
     end
   end
   
-  def assert_select selector, content=nil, text=last_response.body
-    matches = Nokogiri::HTML.parse(text).css(selector)
-    assert(matches.size>0, "No matches for the selector '#{selector}'.")
-    if content
-      matches.each do |el|
-        return assert(true) if el.content.match content
+  def assert_no_select selector, content=nil
+    assert_select selector, content, :want_matches => false
+  end
+  
+  def assert_select selector, content=nil, options={}
+    options = { :want_matches => true }.merge(options)
+    
+    text         = options[:text] || last_response.body
+    want_matches = options[:want_matches]
+    
+    selector = "#{@parent_selector} #{selector}" if @parent_selector
+    
+    elements = Nokogiri::HTML.parse(text).css(selector)
+    have_matches = elements.size>0
+    
+    did_match = if content
+      elements.any? { |el| el.content.match content }
+    else
+      have_matches
+    end
+    
+    if !want_matches
+      assert(!did_match, "Found matches for the selector '#{selector}', but we didn't want any.")
+    else
+      assert(did_match, "No matches for the selector '#{selector}'.") if !content
+      assert(did_match, "No matches for '#{content}' with the selector '#{selector}'.") if content
+    end
+  
+    if block_given? && have_matches
+      begin
+        in_scope, @parent_selector = @parent_selector, selector
+        yield
+      ensure
+        @parent_selector = in_scope
       end
-      assert(false, "No matches for '#{content}' with the selector '#{selector}'.")
     end
+    
   end
   
 end

data/test/utilities_test.rb

@@ -0,0 +1,51 @@
+require "test_helper"
+
+class UtilitiesTest < VitaeTestCase
+  
+  test "we can capture stdout and stderr" do
+    captured_string = get_stdout_and_stderr do
+      puts "hello!"
+      print "h"
+      puts "i"
+      $stderr.print "bye!"
+    end
+    expected_string = "hello!\nhi\nbye!"
+    
+    assert_equal(expected_string, captured_string)
+  end
+  
+  test "yaml can be ordered" do
+    numbers_from_yaml = example_yaml_hash["numbers"].map { |k,v| "#{k} = #{v}" }.join("\n")
+    
+    the_numbers = "one = 1\ntwo = 2\nthree = 3\nfour = 4\nfive = 5\nsix = 6"
+    
+    assert_equal(the_numbers, numbers_from_yaml)
+  end
+  
+  test "ordered hash items can be skipped" do
+    number_string = example_yaml_hash["numbers"].except(%w[one three four five]).map { |k,v| k }.join(", ")
+    assert_equal("two, six", number_string)
+  end
+  
+  def example_yaml_hash
+    yaml_hash_string = %q{
+    --- !omap 
+    - numbers: !omap 
+        - one: 1
+        - two: 2
+        - three: 3
+        - four: 4
+        - five: 5
+        - six: 6
+    }
+    yaml_hash = YAML.load yaml_hash_string
+  end
+  
+  test "CV.first and CV.last do their jobs" do    
+    with_project :dkaz do
+      assert_equal "Arthur", CV.first.name
+      assert_equal "Zeena", CV.last.name
+    end
+  end
+  
+end

data/test/vitae_executable_test.rb

@@ -2,11 +2,6 @@ require "test_helper"
 
 class VitaeExecutableTest < VitaeTestCase
   
-  test "create gives help when called without args" do
-    output = vitae_create
-    assert_match('"create" was called incorrectly', output)
-  end
-  
   test "create generates a project" do
     clear_test_dir
     output = vitae_create("my_cvs")
@@ -35,8 +30,14 @@ class VitaeExecutableTest < VitaeTestCase
     end
   end
   
-  test "the server responds well" do
-    assert_match("Serving CVs", vitae_server("--pretend"))
+  test "the server tells us how many CVs it's serving, where and how" do
+    with_project :dkaz do
+      assert_match("Serving 4 CVs at http://0.0.0.0:3141/ from dkaz\n", vitae_server("--pretend"))
+    end
+    
+    with_project :sals do
+      assert_match("Serving 1 CV at http://0.0.0.0:3141/ from sals\n", vitae_server("--pretend"))
+    end
   end
   
   test "the server accepts a custom port" do
@@ -45,8 +46,13 @@ class VitaeExecutableTest < VitaeTestCase
     assert_match(":1121", vitae_server("--pretend -p 1121"))
   end
   
-  test "the server gives rackup help" do
-    assert_match("Usage: rackup", vitae_server("-h"))
-  end
+  # test "the server gives rackup help" do
+  #   assert_match("Usage: rackup", vitae_server("-h"))
+  # end
+  # 
+  # test "create gives help when called without args" do
+  #   output = vitae_create
+  #   assert_match('"create" was called incorrectly', output)
+  # end
   
 end

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. Under heavy development, not very useful yet.}
+  s.description = %q{Vitae is to CVs what rubygems is to ruby code. Under heavy development, very under development.}
   
   s.add_dependency "sinatra", "~>1.1.0"
   s.add_dependency "haml", "~>3.0.0"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vitae
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Arthur Gunn
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 +13:00
+date: 2010-12-08 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,7 @@ dependencies:
         version: 1.4.0
   type: :development
   version_requirements: *id004
-description: Vitae is to CVs what rubygems is to ruby code. Under heavy development, not very useful yet.
+description: Vitae is to CVs what rubygems is to ruby code. Under heavy development, very under development.
 email: 
 - arthur@gunn.co.nz
 executables: 
@@ -101,13 +101,17 @@ files:
 - bin/vitae
 - config.ru
 - lib/vitae.rb
+- lib/vitae/cli.rb
 - lib/vitae/cv.rb
+- lib/vitae/ordered_hash.rb
 - lib/vitae/server/.gitignore
+- lib/vitae/server/assets/favicon.ico
 - lib/vitae/server/helpers.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/cvs/arthur_gunn.yaml
 - lib/vitae/templates/cvs/default.yaml.tt
 - lib/vitae/templates/themes/default/application.css
@@ -115,8 +119,10 @@ files:
 - lib/vitae/version.rb
 - test/active_server_test.rb
 - test/basic_server_test.rb
+- test/cv_format_test.rb
 - test/tag_helpers_test.rb
 - test/test_helper.rb
+- test/utilities_test.rb
 - test/vitae_executable_test.rb
 - vitae.gemspec
 has_rdoc: true
@@ -156,6 +162,8 @@ summary: A structured CV publishing system.
 test_files: 
 - test/active_server_test.rb
 - test/basic_server_test.rb
+- test/cv_format_test.rb
 - test/tag_helpers_test.rb
 - test/test_helper.rb
+- test/utilities_test.rb
 - test/vitae_executable_test.rb