genit 1.0.1 → 2.0

data/lib/genit/builders/body_link_builder.rb

@@ -4,7 +4,7 @@ module Genit
 
   # Modify links.
   class BodyLinkBuilder < Relativizer
-  
+
     # Public: Relativize links.
     #
     # page_name - The string filename of the page.
@@ -13,13 +13,13 @@ module Genit
     def build_for_page page_name
       build page_name, @document.css("body a")
     end
-    
+
     private
-    
-    def update link
-      super link, "href"
-    end
-  
+
+      def update link
+        super link, "href"
+      end
+
   end
-  
+
 end

data/lib/genit/builders/builder_base.rb

@@ -6,7 +6,7 @@ module Genit
 
   # A base class for all builders.
   class BuilderBase
-  
+
     # Public: Constructor.
     #
     # doc - A Nokogiri::XML::Document
@@ -14,18 +14,18 @@ module Genit
       raise RuntimeError if doc.nil?
       @document = doc
     end
-    
+
     # Define me in child
     def build_for_page page_name
       raise NotImplementedError
     end
-    
+
     def build page_name, elements
       @page_name = page_name
       elements.each {|elem| update elem }
       @document
     end
-    
+
     def BuilderBase.get_number_of_base_dirs filename
       return 0 if filename =~ URI::regexp
       
@@ -34,13 +34,13 @@ module Genit
       
       return dirs.split('/').size
     end
-    
+
     private
-    
-    def make_relative nb
-      nb.times { @path = '../' + @path }
-    end
-  
+
+      def make_relative nb
+        nb.times { @path = '../' + @path }
+      end
+
   end
-  
+
 end

data/lib/genit/builders/head_link_builder.rb

@@ -4,7 +4,7 @@ module Genit
 
   # Modify head link tags.
   class HeadLinkBuilder < Relativizer
-    
+
     # Public: Build the document head link tags of a particular page.
     #
     # page_name - The string filename of the page.
@@ -13,13 +13,13 @@ module Genit
     def build_for_page page_name
       build page_name, @document.css("head link")
     end
-    
+
     private
-    
-    def update link
-      super link, "href"
-    end
-    
+
+      def update link
+        super link, "href"
+      end
+
   end
-  
+
 end

data/lib/genit/builders/relativizer.rb

@@ -7,21 +7,21 @@ module Genit
   # Base class for builder that should relativize
   # some links in a XHTML document.
   class Relativizer < BuilderBase
-  
+
     def not_an_internal_link?
       @path.nil? or @path =~ URI::regexp
     end
-    
+
     private
-    
-    def update link, field
-      @path = link[field]
-      return if not_an_internal_link?
-      nb = BuilderBase::get_number_of_base_dirs @page_name
-      make_relative nb
-      link[field] = @path
-    end
-    
+
+      def update link, field
+        @path = link[field]
+        return if not_an_internal_link?
+        nb = BuilderBase::get_number_of_base_dirs @page_name
+        make_relative nb
+        link[field] = @path
+      end
+
   end
-  
+
 end

data/lib/genit/builders/script_builder.rb

@@ -4,7 +4,7 @@ module Genit
 
   # Modify script tags.
   class ScriptBuilder < Relativizer
-    
+
     # Public: Relativize the <script src=""> tags of a particular page.
     #
     # page_name - The string filename of the page.
@@ -13,13 +13,13 @@ module Genit
     def build_for_page page_name
       build page_name,  @document.css("script")
     end
-    
+
     private
-    
-    def update link
-      super link, "src"
-    end
+
+      def update link
+        super link, "src"
+      end
 
   end
-  
+
 end

data/lib/genit/documents/document_writer.rb

@@ -6,14 +6,14 @@ module Genit
 
   # Write an html or xml document.
   class DocumentWriter
-  
+
     # Public: Constructor.
     #
     # working_dir - the string working directory, where live the project.
     def initialize working_dir
       @working_dir = working_dir
     end
-    
+
     # Save the document as an xhtml file.
     #
     # document - A Nokogiri::HTML or Nokogiri::XML document
@@ -23,18 +23,18 @@ module Genit
       remove_remaining_tags
       FileWriter.write document.to_html, get_full_path(filename.force_html_extension)
     end
-    
+
     private
-    
-    def remove_remaining_tags
-      tags = @document.css 'genit'
-      tags.each {|tag| tag.remove}
-    end
-    
-    def get_full_path filename
-      File.join(@working_dir, 'www', filename)
-    end
-    
+
+      def remove_remaining_tags
+        tags = @document.css 'genit'
+        tags.each {|tag| tag.remove}
+      end
+
+      def get_full_path filename
+        File.join(@working_dir, filename)
+      end
+
   end
-  
+
 end

data/lib/genit/documents/fragment.rb

@@ -4,49 +4,50 @@ module Genit
 
   # Replace each fragment in a page.
   class Fragment
-  
+
     # Public: Constructor.
     #
     # file        - Full String filename of the page.
     # working_dir - The String working directory, where live the project.
     def initialize file, working_dir
-      
       @page = HtmlDocument.open_fragment file
       @working_dir = working_dir
       HtmlDocument.genit_tags_from(@page).each do |tag|
         case tag['class']
           when 'fragment'
             @file = tag['file']
-            error "Incomplete #{tag}" if @file.nil?
-            error "No such file #{tag}" unless File.exists?(File.join(@working_dir, 'fragments', @file))
+            error "Incomplete #{tag}" unless tag.key?('file')
+            unless File.exists?(File.join(@working_dir, FRAGMENTS_DIR, @file))
+              error "No such file #{tag}"
+            end
             replace_fragment 
         end
       end
     end
-    
+
     # Public: Get the page in html format.
     #
     # Returns the html code of the page as a String.
     def to_html
       @page.to_html
     end
-    
+
     private
-    
-    def replace_fragment
-      builder = Builder.new(@page)
-      @page = builder.replace(css_rule, content)
-    end
-    
-    def css_rule
-      "genit.fragment[file='#{@file}']"
-    end
-    
-    def content
-      full_path = File.join(@working_dir, 'fragments', @file)
-      HtmlDocument.open_as_string(full_path)
-    end
-    
+
+      def replace_fragment
+        builder = Builder.new(@page)
+        @page = builder.replace(css_rule, content)
+      end
+
+      def css_rule
+        "genit.fragment[file='#{@file}']"
+      end
+
+      def content
+        full_path = File.join(@working_dir, FRAGMENTS_DIR, @file)
+        HtmlDocument.open_as_string(full_path)
+      end
+
   end
-  
+
 end

data/lib/genit/documents/xml_document.rb

@@ -14,7 +14,11 @@ module Genit
     #
     # Returns a Nokogiri::XML document.
     def self.open file
-      Nokogiri::XML(File.open(file))
+      begin
+        Nokogiri::XML(File.open(file)){|config| config.strict}
+      rescue Nokogiri::XML::SyntaxError => e
+        error "Malformed xhtml in file #{file} : #{e}"
+      end
     end
     
     # Public: Open a fragment of xml document.

data/lib/genit/project.rb

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

data/lib/genit/project/compiler.rb

@@ -1,97 +1,78 @@
 # -*- encoding: utf-8 -*-
 
-require 'fileutils'
-
 module Genit
 
   # Web site "compiler".
   class Compiler
-  
+
     # Public: Constructor.
     #
     # working_dir - The String working directory, where live the project.
     def initialize working_dir
       @working_dir = working_dir
       check_missing_file '.genit', 'Not a genit project folder'
-      check_missing_file '.config', 'Missing config file'
+      check_missing_file 'config', 'Missing config file'
     end
-  
+
     # Public: Compile the web site.
     def compile
-      remove_content_of_www
+      RootCleaner.new(@working_dir).clean
       compile_site
     end
-    
+
     private
-    
-    def check_missing_file filename, message
-      unless File.exist?(File.join(@working_dir, filename))
-        error message
+
+      def check_missing_file filename, message
+        unless File.exist?(File.join(@working_dir, filename))
+          error message
+        end
       end
-    end
-    
-    def remove_content_of_www
-      Dir.foreach(File.join(@working_dir, 'www')) do |file|
-        next if (file == ".") or (file == "..")
-        filename = File.join(@working_dir, 'www', file)
-        FileUtils.remove_dir(filename) if File.directory?(filename)
-        FileUtils.remove_file(filename) if File.file?(filename)
+
+      def compile_site
+        compile_pages
+        create_rss_feed
+        create_sitemap_xml
       end
-    end
-    
-    def compile_site
-      compile_pages
-      copy_static_content
-      create_rss_feed
-      create_sitemap_xml
-    end
-    
-    def compile_pages
-      Dir.glob(File.join(@working_dir, 'pages', '**/*')) do |file|
-        next if File.directory?(file)
-        @filename = file.gsub(File.join(@working_dir, 'pages') + '/', '')
-        compile_page
+
+      def compile_pages
+        Dir.glob(File.join(@working_dir, PAGES_DIR, '**/*')) do |file|
+          next if File.directory?(file)
+          @filename = file.gsub(File.join(@working_dir, PAGES_DIR) + '/', '')
+          compile_page
+        end
       end
-    end
-    
-    def compile_page
-      pc = PageCompiler.new @working_dir, @filename
-      @page = pc.compile
-      save_file_as_xhtml
-    end
-    
-    def save_file_as_xhtml
-      doc_writer = DocumentWriter.new @working_dir
-      doc_writer.save_as_xhtml @page, @filename
-    end
-    
-    def copy_static_content
-      destination = File.join(@working_dir, 'www')
-      FileUtils.cp_r File.join(@working_dir, 'styles'), destination
-      FileUtils.cp_r File.join(@working_dir, 'public'), destination
-      FileUtils.cp_r File.join(@working_dir, 'scripts'), destination
-    end
-    
-    def create_rss_feed
-      all_news_files =
-        Dir.glob(File.join(@working_dir, 'news', '*')).sort.reverse
-      begin
-        config_file = YAML.load_file(File.join(@working_dir, '.config'))
-      rescue ArgumentError => msg
-        error "In .config file: #{msg}"
+
+      def compile_page
+        pc = PageCompiler.new @working_dir, @filename
+        @page = pc.compile
+        save_file_as_xhtml
       end
-      return unless config_file[:rss]
-      RssFeed.new(@working_dir, all_news_files, config_file).generate_rss
-    end
-    
-    def create_sitemap_xml
-      pages = PagesFinder.new(@working_dir).find
-      config_file = YAML.load_file(File.join(@working_dir, '.config'))
-      urls = PagesFinder.pagenames2urls(pages, config_file[:address])
-      sitemap = Sitemap.new(urls).get
-      FileWriter.write sitemap, File.join(@working_dir, 'www', 'sitemap.xml')
-    end
-    
+
+      def save_file_as_xhtml
+        doc_writer = DocumentWriter.new @working_dir
+        doc_writer.save_as_xhtml @page, @filename
+      end
+
+      def create_rss_feed
+        all_news_files =
+          Dir.glob(File.join(@working_dir, NEWS_DIR, '*')).sort.reverse
+        begin
+          config_file = YAML.load_file(File.join(@working_dir, 'config'))
+        rescue Exception => msg
+          error "In config file: #{msg}"
+        end
+        return unless config_file[:rss]
+        RssFeed.new(@working_dir, all_news_files, config_file).generate_rss
+      end
+
+      def create_sitemap_xml
+        pages = PagesFinder.new(@working_dir).find
+        config_file = YAML.load_file(File.join(@working_dir, 'config'))
+        urls = PagesFinder.pagenames2urls(pages, config_file[:address])
+        sitemap = Sitemap.new(urls).get
+        FileWriter.write sitemap, File.join(@working_dir, 'sitemap.xml')
+      end
+
   end
-  
+
 end