vitae 0.1.4 → 0.2.0

data/lib/vitae/cv.rb

@@ -32,15 +32,15 @@ class CV
   
   
   def name
-    @name ||=  data_hash.delete("name")
+    @name ||= data_hash.delete("name")
   end
   
   def vitae_config
-    @vitae_config ||=  data_hash.delete("vitae_config")
+    @vitae_config ||= data_hash.delete("vitae_config")
   end
   
   def data_hash
-    @data_hash ||= YAML::load_file(@yaml_file)
+    @data_hash ||= (YAML::load_file(@yaml_file) rescue Hash.new)
   end
   
   

data/lib/vitae/server/node.rb

@@ -93,7 +93,7 @@ class Node
   end
 
   def child_node_class_from_yaml(value)
-    Node.types[value["node_type"]] if value.respond_to? :[]
+    Node.types[value["node_type"]] if value.is_a? Hash
   end
 
   def child_node_class_from_name(name)

data/lib/vitae/server/server.rb

@@ -1,5 +1,6 @@
 require 'sinatra/base'
 require 'haml'
+require 'pdfkit'
 require "vitae/server/helpers"
 require "vitae/server/node"
 
@@ -9,7 +10,7 @@ class Server < Sinatra::Base
   set :public, File.join(Vitae::project_root, "themes") rescue ''
   
   before do
-    request.path_info = CV.first.link if CV.size==1
+    request.path_info = CV.first.link if CV.size==1 && request.path_info=='/'
   end
   
   get '/' do
@@ -21,11 +22,28 @@ class Server < Sinatra::Base
     send_file File.join(File.dirname(__FILE__), "assets", "favicon.ico"), :type => 'image/x-icon', :disposition => 'inline'
   end
   
-  get '/:name' do
+  get '/:path' do
     reload_nodes_module if ENV["RACK_ENV"]=="development"
     
-    @cv = CV.find( params[:name] )
-    haml :show
+    name, ext = params[:path].split('.')
+    
+    @cv = CV.find( name )
+    
+    case ext.to_s
+    when '', 'html', 'htm'
+      haml :show
+    when 'yaml', 'yml'
+      yaml_path = File.join(Vitae::project_root, "cvs", "#{@cv.file_name}.yaml")
+      send_file yaml_path, :type => 'text/yaml', :disposition => 'inline'
+    when 'pdf'
+      content_type 'application/pdf', :charset => 'utf-8'
+
+      pdf = PDFKit.new(haml(:show), :page_size => 'Letter', :print_media_type => true)
+      pdf.stylesheets << File.join(Server::public, current_theme, "application.css")
+      pdf.to_pdf
+    else
+      "Sorry, we don't have anything with a .#{ext} extension here."
+    end
   end
   
   def reload_nodes_module

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

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

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

@@ -1,5 +1,10 @@
 = haml :vcard, :locals => { :name => @cv.name, :contact_details => @cv["contact"] } if @cv["contact"]
 
+#download-links
+  = link_to "pdf", @cv.link+".pdf"
+  = link_to "html", @cv.link
+  = link_to "yaml", @cv.link+".yaml"
+  
 = Vitae::Nodes::BaseNode.new(@cv.except(%w[vitae_config contact]))
 
 %br

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

@@ -19,49 +19,4 @@
         - postal-code: 9016
     - phones: !omap
         - home: (03) 477 99 44
-        - 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
+        - mobile: 027 477 7723

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

@@ -1,4 +1,8 @@
-/* CSS by Maxim Chernyak and Juriy Zaytsev - https://github.com/maxim/maxim.github.com */
+/*
+ CSS by Maxim Chernyak and Juriy Zaytsev - https://github.com/maxim/maxim.github.com
+ Modified slightly fo vitae.
+*/
+
 body { 
   font-family: Garamond, "Hoefler Text", "Times New Roman", Times, serif;
   font-size: 1.1em;
@@ -42,6 +46,8 @@ img {
 
 #download-links a {
   display: block;
+  padding: 12px;
+  text-align: right;
 }
 
 ul {
@@ -224,7 +230,7 @@ li {
 /* PRINT MEDIA */
 
 @media print {
-  body { color: #000; font-family: Cambria, Georgia, Times, "Times New Roman", serif; font-size: 1.3em; }
+  body { color: #000; font-family: Cambria, Georgia, Times, "Times New Roman", serif; font-size: 1.4em; }
   em { font-weight: bold; }
   a:link, a:visited { color: #007; text-decoration: none; }
   .tags li { color: #000; }

data/lib/vitae/version.rb

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

data/test/active_server_test.rb

@@ -47,6 +47,57 @@ class ActiveServerTest < VitaeServerTestCase
     end
   end
   
+  test "we have format links" do
+    with_project :sals do
+      get '/'
+      
+      assert_select "#download-links" do
+        assert_select  "a[href='/sajal_shah']", "html"
+        assert_select  "a[href='/sajal_shah.yaml']", "yaml"
+        assert_select  "a[href='/sajal_shah.pdf']", "pdf"
+      end
+    end
+  end
+  
+  test "serves pdfs" do
+    with_project :default do
+      get '/arthur_gunn.pdf'
+      assert last_response.ok?
+      
+      # how to test this?
+    end
+  end
+  
+  test "serves yaml files" do
+    with_project :default do
+      get '/arthur_gunn.yaml'
+      assert last_response.ok?
+      
+      # check that we get some yaml:
+      assert_match %r(--- !omap\n- name: Arthur Gunn), last_response.body
+    end
+  end
+  
+  test "repsonds to pages with .html extension" do
+    with_project :default do
+      get '/arthur_gunn.html'
+      assert last_response.ok?
+      
+      # do some standard content checks:
+      check_includes_standard_assets
+      assert_select "h1", "Arthur Gunn"
+    end
+  end
+  
+  test "gives error if user requests an unsupported extension" do
+    with_project :default do
+      get '/arthur_gunn.bogus'
+      # assert !last_response.ok?
+      
+      assert_equal("Sorry, we don't have anything with a .bogus extension here.", last_response.body)
+    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/vitae.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra", "~>1.1.0"
   s.add_dependency "haml", "~>3.0.0"
   s.add_dependency "thor", "~>0.14.0"
+  s.add_dependency "pdfkit", "~>0.5.0"
   
   s.add_development_dependency "nokogiri", "~>1.4.0"
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Arthur Gunn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +13:00
+date: 2011-02-04 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,9 +63,24 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: pdfkit
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,7 +91,7 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 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