genit 2.0 → 2.1

data/NEWS

@@ -1,3 +1,8 @@
+v2.1  2013-04-02
+  * Support Haml
+  * Support Sass
+
+
 v2.0  2013-03-29
   * Improve the layout folder structure, which add interesting side effects:
     - faster compilation

data/README.markdown

@@ -6,13 +6,6 @@ and database. A genit site consists only of xhtml code (+ css, medias and eventu
 
 Genit is written in Ruby but there is no needs to know the Ruby language.
 
-**------------------------------------------------------------------------**
-
-**This readme file and all the documentation refers to version 1.0 of genit.
-I'm currently writing the doc for genit version 2.0**
-
-**------------------------------------------------------------------------**
-
 Description
 -----------
 
@@ -50,9 +43,8 @@ Usage
 
     genit create my-site
     cd my-site
-(*edit some pages*)
-
     genit compile
+    genit server
 
 See the wiki for user documentation and a tutorial.
 
@@ -66,6 +58,11 @@ Dependencies
   * nokogiri (xml parser)
   * bluecloth (markdown parser)
   * clamp (command line utility)
+  * haml (clean markup language)
+  * sass (CSS extension)
+
+See [installing nokogiri](http://nokogiri.org/tutorials/installing_nokogiri.html)
+for possible dependencies depending of your operating system.
 
 ### Contributors dependencies
 
@@ -78,7 +75,7 @@ License
 
 Expat License (also known as MIT)
 
-    Copyright (c) 2011 Xavier Nayrac
+    Copyright (c) 2011-2013 Xavier Nayrac
 
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the

data/TODO

@@ -1,28 +1,50 @@
-version 2
+version 2.1
 =============================================================
 
-[done] improve the layout folder structure
-[done] html5 uniquement
-[done] ajouter un serveur
-[done] config file should not be hidden
-[done] retirer alsa et yui
-[done] error msg when template is malformed
+[ok] use haml
+  [ok] utiliser haml dans pages 
+  [ok] utiliser haml dans fragments
+  [ok] utiliser haml dans news
+  [ok] utiliser haml dans templates
+  [ok] genit create --haml
+
+[ok] use sass/scss
+[ok] doit marcher avec sous-dossiers
+
 
 
 version 2.x
 ===============================================================
+s'assurer que <genit class="footer"/> existe, sinon le readme ment.
+
+tester avec la dernière version de clamp, et certainement arreter la version
+dans le gemspec
+
+Pouvoir utiliser les news avec markdown. Apparement c'est déjà possible,
+il faut tester.
+
+s'assurer qu'on puisse avoir des sous-dossiers dans fragments/.
+
 menu: Pouvoir changer l'id "actif". Exemple li.active avec twitter bootstrap.
 a custom class for the selected menu item
 
-use haml
+un tuto juste pour le menu
 
-use sass/scss or less
+think about a pager for the news
 
-Document the genit tag and its attributes
+how to: a blog in 5 minutes
 
-think about a deamon to auto-compile
+less support
 
-think about a pager for the news
+--minimize option for the compile command
+
+
+En attente
+=========================================
+
+un template pour les news ?
+
+think about a deamon to auto-compile
 
 Think about i18n
 
@@ -30,8 +52,6 @@ per page script
 
 per page style
 
---minimize option for the compile command
-
 si j'écris <h1>news page (en oubliant le tag de fin) Genit ne dis
 rien et ajoute silencieusement le </h1>. Voir si on peut lui faire
 cracher une erreur.
@@ -42,15 +62,15 @@ d'avoir une erreur
 si j'écris </br> (au lieu de <br/>) Genit ne dis rien, le tag est ignoré.
 Voir si on peut lui faire cracher une erreur.
 
-Pouvoir utiliser les news avec markdown.
-
 dans le dossier page on accepte uniquement .html et .markdown (sinon erreur)
 
+refaire toutes les copies d'écran du site
 
+refactor ProjectCreator si j'ajoute un autre moteur de template.
 
 
 Project guidelines
-==================
+=====================================================================
 
 Basic objectives
 ----------------

data/VERSION

@@ -1 +1 @@
-2.0
+2.1

data/bin/genit

@@ -45,9 +45,12 @@ module Genit
               :attribute_name => :project_name
     option ["-e", "--empty"], :flag, "Do not produce smoke test",
            :default => false
+    option ["-H", "--haml"], :flag, "Create project files with haml",
+           :default => false
 
+    # TODO faire un hash d'option pour empty?, etc.
     def execute
-      project = ProjectCreator.new project_name, empty?
+      project = ProjectCreator.new project_name, empty?, haml?
       project.create
     end
   end

data/data/pages/index.haml

@@ -0,0 +1,29 @@
+%h1 Welcome to Genit !
+%p
+  Genit is a framework to build a
+  = succeed "," do
+    %strong static web site
+  that is a web site without server
+  side programing language and database. A genit site consists only of xhtml code (+ css, medias and
+  eventually javascript).
+  %br/
+  %br/
+  %em Genit is written in Ruby but there is no needs to know the Ruby language.
+  %br/
+  %br/
+  The Genit project is hosted on
+  %a{:href => "https://github.com/lkdjiin/genit", :title => "Source code of Genit"} GitHub
+  under the terms
+  of the MIT license. Feel free to fork it. Each new release will be announced on the
+  %a{:href => "http://freshmeat.net/projects/genit", :title => "Genit project on freshmeat"} freshmeat
+  site.
+  The development progress will be announced on
+  = succeed "." do
+    %a{:href => "http://twitter.com/lkdjiin"} Twitter
+%h1 Get started
+%p
+  Read the <a href="http://lkdjiin.github.com/genit/documentation/tutorial.html"
+  "A short get started tutorial for Genit">tutorial
+  first, then have a look at the
+  = succeed "." do
+    %a{:href => "http://lkdjiin.github.com/genit/documentation/index.html"} documentation

data/data/pages/index2.haml

@@ -0,0 +1 @@
+%h1 home page

data/data/templates/html_5.haml

@@ -0,0 +1,10 @@
+!!! 5
+%html{:lang => "en"}
+  %head
+    %meta{:charset => "UTF-8"}/
+    %title Genit - Static web site framework
+    %link{:href => "styles/screen.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}/
+    %link{:href => "styles/print.css", :media => "print", :rel => "stylesheet", :type => "text/css"}/
+  %body
+    %genit.menu/
+    %genit.pages/

data/data/templates/menu.haml

@@ -0,0 +1,3 @@
+%ul#menu
+  %li
+    %a{:href => "index.html"} home

data/lib/genit.rb

@@ -7,6 +7,8 @@ require 'genit/builders'
 require 'genit/tags'
 require 'genit/server'
 
+require 'sass'
+
 module Errors
 
   def error message
@@ -27,4 +29,5 @@ module Genit
   TEMPLATES_DIR = "src/templates"
   FRAGMENTS_DIR = "src/fragments"
   NEWS_DIR = "src/news"
+  STYLES_DIR = "styles"
 end

data/lib/genit/documents/html_document.rb

@@ -2,12 +2,13 @@
 
 require 'nokogiri'
 require 'bluecloth'
+require 'haml'
 
 module Genit
 
   # Open an html file in various format.
   class HtmlDocument
-  
+
     # Public: Open an entire html document.
     # If the file does not contain a <bogy> tag, a doctype, etc, they will be
     # automatically added.
@@ -18,7 +19,7 @@ module Genit
     def self.open file
       Nokogiri::HTML(File.open(file))
     end
-    
+
     # Public: Open a fragment of html document.
     #
     # file - Full path String filename.
@@ -28,7 +29,7 @@ module Genit
       string = IO.read file
       Nokogiri::HTML.fragment string
     end
-    
+
     # Public: Open a file as a string.
     #
     # file - Full path String name of a html or markdown file.
@@ -38,26 +39,31 @@ module Genit
       string = IO.read file
       if file.markdown_ext?
         BlueCloth.new(string).to_html 
+      elsif file.haml_ext?
+        Haml::Engine.new(string, :format => :xhtml).render
       else
         string
       end
     end
-    
+
     # Public: Open a file as a string, taking care of fragment tags.
     # All fragment tags are replaced by a new content.
     #
-    # file - Full path String name of a html or markdown file.
+    # file - Full path String name of a (html|markdown|haml) file.
     #
     # Returns a String.
     def self.build_page_content(file, working_dir)
       # TODO éviter le working_dir
+      str = IO.read(file)
       if file.markdown_ext?
-        BlueCloth.new(IO.read(file)).to_html
+        BlueCloth.new(str).to_html
+      elsif file.haml_ext?
+        Haml::Engine.new(str, :format => :xhtml).render
       else
         Fragment.new(file, working_dir).to_html
       end
     end
-    
+
     # Public: Get the list of <genit> tag in a document.
     #
     # file - Nokogiri::HTML or Nokogiri::XML document.
@@ -66,7 +72,7 @@ module Genit
     def self.genit_tags_from file
       file.css "genit"
     end
-    
+
   end
 
 end

data/lib/genit/documents/xml_document.rb

@@ -2,6 +2,7 @@
 
 require 'nokogiri'
 require 'bluecloth'
+require 'haml'
 
 module Genit
 
@@ -16,10 +17,20 @@ module Genit
     def self.open file
       begin
         Nokogiri::XML(File.open(file)){|config| config.strict}
-      rescue Nokogiri::XML::SyntaxError => e
-        error "Malformed xhtml in file #{file} : #{e}"
+      rescue Nokogiri::XML::SyntaxError => ex
+        error "Malformed xhtml in file #{file} : #{ex}"
       end
     end
+
+    # Public: Open a (xml) document from a haml file.
+    #
+    # file - Full path String filename of haml file.
+    #
+    # Returns a Nokogiri::XML document.
+    def self.open_via_haml file
+      tmp = Haml::Engine.new(File.open(file).read, :format => :xhtml).render
+      Nokogiri::XML(tmp) 
+    end
     
     # Public: Open a fragment of xml document.
     #

data/lib/genit/extensions/string_extension.rb

@@ -3,15 +3,18 @@
 class String
 
   def force_html_extension
-    self.gsub /markdown$/, 'html'
+    self.gsub /(markdown|haml)$/, 'html'
   end
   
   def force_html_extension!
-    self.gsub! /markdown$/, 'html'
+    self.gsub! /(markdown|haml)$/, 'html'
   end
   
   def markdown_ext?
     self.end_with?('.markdown')
   end
   
+  def haml_ext?
+    self.end_with?('.haml')
+  end
 end

data/lib/genit/project.rb

@@ -5,3 +5,4 @@ require 'genit/project/page_compiler'
 require 'genit/project/rss_feed'
 require 'genit/project/pages_finder'
 require 'genit/project/root_cleaner'
+require 'genit/project/css'

data/lib/genit/project/compiler.rb

@@ -18,6 +18,7 @@ module Genit
     def compile
       RootCleaner.new(@working_dir).clean
       compile_site
+      Css.new(@working_dir).render
     end
 
     private

data/lib/genit/project/css.rb

@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+
+require 'sass'
+
+module Genit
+
+  # Deals with the styles directory.
+  class Css
+
+    # Public: Constructor.
+    #
+    # working_dir - The String working directory, where live the project.
+    def initialize working_dir
+      @working_dir = working_dir
+    end
+
+    # Public: Render css in the styles directory.
+    #
+    # Returns nothing.
+    def render
+      Dir.glob(File.join(@working_dir, STYLES_DIR, '**/*')) do |filename|
+        @filename = filename
+        if @filename.end_with?(".sass")
+          render_sass :sass
+        elsif @filename.end_with?(".scss")
+          render_sass :scss
+        end
+      end
+    end
+
+    private
+
+      # Render css from sass in the styles directory.
+      # 
+      # type - A Symbol for the sass syntax, either :sass or :scss.
+      #
+      # Returns nothing.
+      def render_sass type
+        template = File.open(@filename).read
+        begin
+          css = Sass::Engine.new(template, syntax: type).render
+        rescue Exception => ex
+          error "In #{@filename}\n  #{ex}"
+        end
+        @filename.gsub!(/(sass|scss)$/, 'css')
+        File.open(@filename, "w") {|out| out.puts css }
+      end
+  end
+end
+

data/lib/genit/project/page_compiler.rb

@@ -12,8 +12,18 @@ module Genit
     def initialize working_dir, filename
       @working_dir = working_dir
       @filename = filename
-      file = File.join(@working_dir, 'src/templates/main.html')
-      @template = XmlDocument.open(file)
+      # file = File.join(@working_dir, 'src/templates/main.html')
+      # @template = XmlDocument.open(file)
+      file = File.join(@working_dir, 'src/templates/main')
+      if File.exists?("#{file}.html")
+        file = file + ".html"
+        @template = XmlDocument.open(file)
+      elsif File.exists?("#{file}.haml")
+        file = file + ".haml"
+        @template = XmlDocument.open_via_haml(file)
+      else
+        error "No template found"
+      end
     end
 
     # Public: Compile the page.

data/lib/genit/project/project_creator.rb

@@ -12,9 +12,12 @@ module Genit
     #
     # name    - The String name of the future project folder.
     # empty   - A Boolean telling if we produce a smoke test or not.
-    def initialize name, empty
+    # haml    - A Boolean telling if we want project's files in haml or
+    #           not.
+    def initialize name, empty, haml
       @project_name = name
       @empty = empty
+      @haml = haml
     end
 
     # Public: Create the structure of the project, that is many
@@ -103,13 +106,30 @@ module Genit
 
       # TODO document
       def copy_index
-        dest =  File.join @project_name, 'src/pages/index.html'
+        dest = index_destination
+        src = index_source
+        FileUtils.cp src, dest
+      end
+
+      def index_destination
+        if @haml
+          File.join @project_name, 'src/pages/index.haml'
+        else
+          File.join @project_name, 'src/pages/index.html'
+        end
+      end
+
+      def index_source
         if @empty
-          src = File.join $GENIT_PATH, 'data/pages/index2.html'
+          src = File.join $GENIT_PATH, 'data/pages/index2.'
         else
-          src = File.join $GENIT_PATH, 'data/pages/index.html'
+          src = File.join $GENIT_PATH, 'data/pages/index.'
+        end
+        if @haml
+          "#{src}haml"
+        else
+          "#{src}html"
         end
-        FileUtils.cp src, dest
       end
 
       # TODO document
@@ -125,14 +145,33 @@ module Genit
 
       # TODO document
       def copy_main_template
+        if @haml
+          copy_main_template_haml
+        else
+          copy_main_template_html
+        end
+      end
+
+      def copy_main_template_haml
+        dest =  File.join @project_name, 'src/templates', 'main.haml'
+        src = File.join $GENIT_PATH, 'data', 'templates', "html_5.haml"
+        FileUtils.cp src, dest
+      end
+
+      def copy_main_template_html
         dest =  File.join @project_name, 'src/templates', 'main.html'
         copy_first_part dest
         ProjectCreator.append_last_part dest
       end
 
       def copy_menu_template
-        dest =  File.join @project_name, 'src/templates', 'menu.html'
-        src = File.join $GENIT_PATH, 'data', 'templates', 'menu.html'
+        if @haml
+          dest =  File.join @project_name, 'src/templates', 'menu.haml'
+          src = File.join $GENIT_PATH, 'data', 'templates', 'menu.haml'
+        else
+          dest =  File.join @project_name, 'src/templates', 'menu.html'
+          src = File.join $GENIT_PATH, 'data', 'templates', 'menu.html'
+        end
         FileUtils.cp src, dest
       end
 

data/lib/genit/tags/class_menu_tag.rb

@@ -26,11 +26,20 @@ module Genit
     private
     
     def build_menu
-      file = File.join(@working_dir, TEMPLATES_DIR, "menu.html")
-      menu = XmlDocument.open(file)
-      builder = MenuBuilder.new(menu)
+      builder = MenuBuilder.new(menu_document)
       @menu = builder.build_for_page(@filename)
     end
+
+    def menu_document
+      file = File.join(@working_dir, TEMPLATES_DIR, "menu.")
+      if File.exists?("#{file}html")
+        XmlDocument.open("#{file}html")
+      elsif File.exists?("#{file}haml")
+        XmlDocument.open_via_haml("#{file}haml")
+      else
+        error "No menu template"
+      end
+    end
     
   end
   

data/lib/genit/tags/class_tag.rb

@@ -4,7 +4,7 @@ module Genit
 
   # A Genit general tag.
   class ClassTag < Tag
-    
+
     # Public: Constructor.
     #
     # working_dir - The String working directory, where live the project.
@@ -14,7 +14,7 @@ module Genit
     def initialize working_dir, template, filename, tag
       super working_dir, template, filename, tag
     end
-    
+
     # Public: Replace something in the template.
     #
     # Returns the template as a Nokogiri::XML::Document
@@ -28,7 +28,7 @@ module Genit
           error "Unknown tag #{@tag}"
       end
     end
-    
+
   end
 
 end

data/spec/compiler_spec.rb

@@ -5,7 +5,7 @@ require './spec/helper'
 describe Compiler do
 
   before :each do
-    @project = ProjectCreator.new('spec/project-name', false)
+    @project = ProjectCreator.new('spec/project-name', false, false)
     @project.create
     @compiler = Compiler.new test_project_path
   end
@@ -20,9 +20,26 @@ describe Compiler do
     end
   end
 
-  it "should build an index.html page" do
-    @compiler.compile
-    File.exist?('spec/project-name/index.html').should be_true
+  context "after compilation" do
+    before :each do
+      @compiler.compile
+    end
+
+    it "should build an index.html page" do
+      File.exist?('spec/project-name/index.html').should be_true
+    end
+
+    it "should set the menu in index page" do
+      doc = Nokogiri::HTML(File.open("spec/project-name/index.html"))
+      doc.at_css("ul#menu a#selected")['href'].should == 'index.html'
+    end
+
+    describe "RSS feed" do
+      it "should build the rss.xml file" do
+        File.exist?('spec/project-name/rss.xml').should be_true
+      end
+    end
+
   end
 
   it "should build two pages" do
@@ -32,19 +49,13 @@ describe Compiler do
     File.exist?('spec/project-name/doc.html').should be_true
   end
 
-  it "should set the menu in index page" do
-    @compiler.compile
-    doc = Nokogiri::HTML(File.open("spec/project-name/index.html"))
-    doc.at_css("ul#menu a#selected")['href'].should == 'index.html'
-  end
-  
   context "with no '.genit' file" do
     it "should exit" do
       $stdout.should_receive(:puts).with(/Not a genit project folder/i)
       lambda{Compiler.new File.expand_path('.')}.should raise_error(SystemExit)
     end
   end
-  
+
   context "with no 'config' file" do
     it "should exit" do
       $stdout.should_receive(:puts).with(/Missing config file/i)
@@ -52,14 +63,7 @@ describe Compiler do
       lambda{Compiler.new test_project_path}.should raise_error(SystemExit)
     end
   end
-  
-  describe "RSS feed" do
-    it "should build the rss.xml file" do
-      @compiler.compile
-      File.exist?('spec/project-name/rss.xml').should be_true
-    end
-  end
-  
+
   describe "Sitemap XML" do
     it "should build the 'sitemap.xml'" do
       a_news = %q{<h1>title</h1>}
@@ -71,6 +75,54 @@ describe Compiler do
     end
   end
 
+  context "with sass as stylesheet" do
+    before :each do
+      # remove screen.css
+      FileUtils.rm "spec/project-name/styles/screen.css"
+      # create screen.sass
+      file = %q{
+.content-navigation
+  border-color: blue
+      }
+      File.open('spec/project-name/styles/screen.sass', "w") do |out|
+        out.puts file
+      end
+      @compiler.compile
+    end
+
+    it "should produce css file" do
+      File.exists?("spec/project-name/styles/screen.css").should be_true
+    end
+
+    it "should not remove sass file" do
+      File.exists?("spec/project-name/styles/screen.sass").should be_true
+    end
+  end
+
+  context "with scss as stylesheet" do
+    before :each do
+      # remove screen.css
+      FileUtils.rm "spec/project-name/styles/screen.css"
+      # create screen.scss
+      file = "
+        .content-navigation {
+          border-color: blue;
+          color: darken(blue, 9%); }"
+      File.open('spec/project-name/styles/screen.scss', "w") do |out|
+        out.puts file
+      end
+      @compiler.compile
+    end
+
+    it "should produce css file" do
+      File.exists?("spec/project-name/styles/screen.css").should be_true
+    end
+
+    it "should not remove scss file" do
+      File.exists?("spec/project-name/styles/screen.scss").should be_true
+    end
+  end
+
   context "with bad tag syntax" do
     context "with unknown class into template" do
       it "should exit" do
@@ -188,7 +240,6 @@ describe Compiler do
         main = %q{
           <html>
             <body>
-              
               <genit class="pages"/>
               <genit here="foo"/>
             </body>

data/spec/extensions_spec.rb

@@ -5,31 +5,49 @@ require './spec/helper'
 describe "Standard class String extensions" do
 
   it "should replace a markdown file ext" do
-    string = "file.markdown"
-    result = string.force_html_extension
-    result.should == "file.html"
+    "file.markdown".force_html_extension.should == "file.html"
+  end
+
+  it "should replace a haml file ext" do
+    "file.haml".force_html_extension.should == "file.html"
   end
-  
+
   it "should replace a markdown file ext !" do
     string = "file.markdown"
     string.force_html_extension!
     string.should == "file.html"
   end
-  
+
+  it "should replace a haml file ext !" do
+    string = "file.haml"
+    string.force_html_extension!
+    string.should == "file.html"
+  end
+
   it "should not replace an other file ext" do
+    "file.txt".force_html_extension.should == "file.txt"
+  end
+
+  it "should not replace an other file ext !" do
     string = "file.txt"
     string.force_html_extension!
     string.should == "file.txt"
   end
-  
+
   it "should say if it has a markdown file extension" do
-    string = "file.markdown"
-    string.markdown_ext?.should be_true
+    "file.markdown".markdown_ext?.should be_true
   end
-  
+
+  it "should say if it has a haml file extension" do
+    "file.haml".haml_ext?.should be_true
+  end
+
   it "should say if it has not a markdown file extension" do
-    string = "file.other"
-    string.markdown_ext?.should be_false
+    "file.other".markdown_ext?.should be_false
+  end
+
+  it "should say if it has not a haml file extension" do
+    "file.other".haml_ext?.should be_false
   end
 
 end

data/spec/fragment_spec.rb

@@ -4,28 +4,28 @@ require './spec/helper'
 
 describe Fragment do
 
-  # it "should replace one fragment tag" do
-  #   fragment = Fragment.new("spec/test-files/fragment.html", 'spec/test-files')
-  #   fragment.to_html.start_with?('<h1>title</h1>').should be_true
-  # end
+  it "should replace one fragment tag" do
+    fragment = Fragment.new("spec/test-files/fragment.html", 'spec/test-files')
+    fragment.to_html.start_with?('<h1>title</h1>').should be_true
+  end
   
-  # it "should replace one fragment tag among other tags" do
-  #   fragment = Fragment.new("spec/test-files/fragment4.html", 'spec/test-files')
-  #   result = fragment.to_html
-  #   result.gsub!("\n", '')
-  #   result.should == '<h1>title</h1><p>para</p><p>footer</p>'
-  # end
+  it "should replace one fragment tag among other tags" do
+    fragment = Fragment.new("spec/test-files/fragment4.html", 'spec/test-files')
+    result = fragment.to_html
+    result.gsub!("\n", '')
+    result.should == '<h1>title</h1><p>para</p><p>footer</p>'
+  end
   
-  # it "should replace one fragment tag in markdown" do
-  #   fragment = Fragment.new("spec/test-files/fragment3.html", 'spec/test-files')
-  #   fragment.to_html.start_with?('<h1>title</h1>').should be_true
-  # end
+  it "should replace one fragment tag in markdown" do
+    fragment = Fragment.new("spec/test-files/fragment3.html", 'spec/test-files')
+    fragment.to_html.start_with?('<h1>title</h1>').should be_true
+  end
   
-  # it "should replace some fragment tags" do
-  #   fragment = Fragment.new("spec/test-files/fragment2.html", 'spec/test-files')
-  #   result = fragment.to_html.gsub("\n", '')
-  #   result.should == ("<p>abcde</p>")
-  # end
+  it "should replace some fragment tags" do
+    fragment = Fragment.new("spec/test-files/fragment2.html", 'spec/test-files')
+    result = fragment.to_html.gsub("\n", '')
+    result.should == ("<p>abcde</p>")
+  end
 
   it "should not change a file without fragment tag" do
     fragment = Fragment.new("spec/test-files/nothing.html", 'spec/test-files')

data/spec/haml_spec.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+
+require './spec/helper'
+
+describe "Haml expectations" do
+
+  before :all do
+    Haml::Options.defaults[:format] = :xhtml
+  end
+
+  it "should accept and close the genit tag" do
+    e = Haml::Engine.new("%genit")
+    e.render.should == "<genit></genit>\n"
+  end
+end

data/spec/html_document_spec.rb

@@ -27,13 +27,22 @@ describe HtmlDocument do
   end
 
   it "should build a page content from markdown" do
-    content = HtmlDocument.build_page_content("spec/test-files/test.markdown", 'spec/test-files')
+    content = HtmlDocument.build_page_content("spec/test-files/test.markdown",
+                                              'spec/test-files')
     content.should == '<h1>title</h1>'
   end
 
-  # it "should build page content from html" do
-  #   content = HtmlDocument.build_page_content("spec/test-files/fragment.html", 'spec/test-files')
-  #   content.start_with?('<h1>title</h1>').should be_true
-  # end
+  it "should build a page content from haml" do
+    content = HtmlDocument.build_page_content("spec/test-files/test.haml", 
+                                              'spec/test-files')
+    content.should == "<h1>title</h1>\n"
+  end
+
+  it "should build page content from html" do
+    content = HtmlDocument.build_page_content(
+      "spec/test-files/fragment.html", 
+      'spec/test-files')
+    content.start_with?('<h1>title</h1>').should be_true
+  end
 
 end

data/spec/pages_finder_spec.rb

@@ -5,7 +5,7 @@ require './spec/helper'
 describe PagesFinder do
 
   before :each do
-    @project = ProjectCreator.new('spec/project-name', false)
+    @project = ProjectCreator.new('spec/project-name', false, false)
     @project.create
     @finder = PagesFinder.new 'spec/project-name'
   end

data/spec/project_creator_spec.rb

@@ -5,7 +5,7 @@ require './spec/helper'
 describe ProjectCreator do
 
   before :all do
-    @project = ProjectCreator.new('spec/project-name', false)
+    @project = ProjectCreator.new('spec/project-name', false, false)
     @project.create
   end
 
@@ -26,7 +26,7 @@ describe ProjectCreator do
     end
 
     it "should say it if it cannot create a project" do
-      project = ProjectCreator.new('/root/project', false)
+      project = ProjectCreator.new('/root/project', false, false)
       $stdout.should_receive(:puts).with("Cannot create project...")
       project.create
     end

data/spec/sass_spec.rb

@@ -0,0 +1,11 @@
+# -*- encoding: utf-8 -*-
+
+require './spec/helper'
+
+describe "sass expectations" do
+
+  it "should keep the render API" do
+    e = Sass::Engine.new ""
+    e.should respond_to :render
+  end
+end

data/spec/test-files/src/fragments/b.html

@@ -0,0 +1 @@
+b

data/spec/test-files/src/fragments/d.html

@@ -0,0 +1 @@
+d

data/spec/test-files/src/fragments/footer.html

@@ -0,0 +1 @@
+<p>footer</p>

data/spec/test-files/src/fragments/title.html

@@ -0,0 +1 @@
+<h1>title</h1>

data/spec/test-files/src/fragments/title.markdown

@@ -0,0 +1,2 @@
+title
+======

data/spec/test-files/test.haml

@@ -0,0 +1 @@
+%h1 title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genit
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -59,6 +59,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.7
 description: ! "Genit builds a **static web site**, that is a web site without server
   side \nprograming language and database. The site consists only of xhtml code (+
   css and medias) and \neventually of javascript. It is a command line framework,
@@ -73,6 +105,7 @@ extra_rdoc_files: []
 files:
 - lib/genit/project/pages_finder.rb
 - lib/genit/project/rss_feed.rb
+- lib/genit/project/css.rb
 - lib/genit/project/project_creator.rb
 - lib/genit/project/page_compiler.rb
 - lib/genit/project/root_cleaner.rb
@@ -113,11 +146,15 @@ files:
 - lib/genit.rb
 - bin/genit
 - data/templates/html_5
+- data/templates/menu.haml
+- data/templates/html_5.haml
 - data/templates/menu.html
 - data/templates/main.html
 - data/styles/handheld.css
 - data/styles/print.css
 - data/styles/screen.css
+- data/pages/index.haml
+- data/pages/index2.haml
 - data/pages/index.html
 - data/pages/index2.html
 - spec/file_writer_spec.rb
@@ -126,6 +163,7 @@ files:
 - spec/builder_spec.rb
 - spec/fragment_spec.rb
 - spec/menu_builder_spec.rb
+- spec/haml_spec.rb
 - spec/helper.rb
 - spec/html_document_spec.rb
 - spec/builder_base_spec.rb
@@ -138,9 +176,15 @@ files:
 - spec/test-files/malformed.html
 - spec/test-files/fragment4.html
 - spec/test-files/fragment3.html
+- spec/test-files/test.haml
 - spec/test-files/test.markdown
 - spec/test-files/fragment2.html
 - spec/test-files/fragment.html
+- spec/test-files/src/fragments/footer.html
+- spec/test-files/src/fragments/b.html
+- spec/test-files/src/fragments/title.html
+- spec/test-files/src/fragments/title.markdown
+- spec/test-files/src/fragments/d.html
 - spec/test-files/fragments/footer.html
 - spec/test-files/fragments/b.html
 - spec/test-files/fragments/title.html
@@ -152,6 +196,7 @@ files:
 - spec/class_tag_spec.rb
 - spec/pages_finder_spec.rb
 - spec/xml_document_spec.rb
+- spec/sass_spec.rb
 - VERSION
 - NEWS
 - README.markdown