genit 0.5 → 0.9

data/NEWS

@@ -1,3 +1,23 @@
+v0.9  2011-09-04
+
+  * You can add news to your site with ease
+  
+  * The tag 'var' does not exist anymore. It is replaced by the two-part tag
+    'here' & 'what'
+  
+  * Put your public files (photo, text, pdf, etc.) in the 'public' folder
+  
+  * Put your javascript in the 'scripts' folder
+  
+  * Relative links should be written relative to the root (the index.hmtl file)
+  
+  * New '--empty' switch for the 'create' command
+  
+  * New '--doctype' option for the 'create' command
+  
+  * Fix bug #38: named anchor crashes the compiler
+  
+
 v0.5  2011-08-06
 
   * You can pass string variables from page to template

data/TODO

@@ -1,9 +1,45 @@
-dans la doc : tous les liens internes doivent être relatifs au dossier de base (fichier index.html)
 
 
 
--------------
-news
 
+BUG
+==================
 
--------------
+
+
+
+LES NEWS
+====================
+
+D'abord simple, en html et en markdown:
+
+<genit class="news" number="4" />
+<genit class="news" />
+
+
+Puis avec un wrapper:
+
+<genit class="news" number="4" wrapper="a_news" />
+<genit class="news" wrapper="a_news" />
+
+
+TAG HERE & WHAT remplacent var
+===============================
+
+DOSSIER PUBLIC
+================================
+
+SCRIPTS
+=============================
+
+Les liens <img src> doivent être relativisés (comme les <a>)
+============================================================
+
+les scripts doivent être relativisés
+==========================================================
+
+switch --empty pour commande create
+======================================
+
+supprimer le contenu de www/ avant compilation
+==================================================

data/VERSION

@@ -1 +1 @@
-0.5
+0.9

data/bin/genit

@@ -37,15 +37,23 @@ module Genit
       puts "genit #{File.read(File.join($GENIT_PATH, 'VERSION')).strip}"
       exit 0
     end
-
+    
   end
   
   class CreateCommand < AbstractCommand
   
     parameter "NAME", "the name of the project", :attribute_name => :project_name
+    option ["-d", "--doctype"], "DOCTYPE", "The Document Type Definition", :default => "html_5"
+    option ["-e", "--empty"], :flag, "Do not produce smoke test", :default => false
+
 
     def execute
-      project = ProjectCreator.new project_name
+      valid_doctypes = ['xhtml_1.0_strict', 'xhtml_1.0_transitional', 'html_5']
+      unless valid_doctypes.include? doctype
+        puts 'Valid doctypes are ' + valid_doctypes.inspect
+        exit 1
+      end
+      project = ProjectCreator.new project_name, doctype, empty?
       project.create
     end
     

data/data/pages/index.html

@@ -4,25 +4,24 @@
 Genit is a framework to build a <strong>static web site</strong>, 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).
-</p>
-
-<p>
+<br/>
+<br/>
 <em>Genit is written in Ruby but there is no needs to know the Ruby language.</em>
-</p>
-
-<p>
+<br/>
+<br/>
 The Genit project is hosted on 
 <a href="https://github.com/lkdjiin/genit" title="Source code of Genit">GitHub</a> 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</a> site.
-The development progress will be announced on Twitter:<br/>
-<a href="http://twitter.com/lkdjiin" class="twitter-follow-button" data-show-count="false">Follow @lkdjiin</a>
-<script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
+The development progress will be announced on 
+<a href="http://twitter.com/lkdjiin">Twitter</a>.
+
 </p>
 
 <h1>Get started</h1>
 
 <p>
-Read the <a href="https://github.com/lkdjiin/genit/blob/master/documentation/tutorial.markdown"
-"A short get started tutorial for Genit">tutorial</a> and make your site !
+Read the <a href="http://lkdjiin.github.com/genit/documentation/tutorial.html"
+"A short get started tutorial for Genit">tutorial</a> first, then have a look at the
+<a href="http://lkdjiin.github.com/genit/documentation/index.html">documentation</a>.
 </p>

data/data/pages/index2.html

@@ -0,0 +1 @@
+<h1>home page</h1>

data/data/styles/screen.css

@@ -1,9 +1,14 @@
 /* Delete this content and write your own rules */
 
 body {
-width:600px;
+width:300px;
 margin:0 auto;
 font-family: Arial, Helvetica, FreeSans, sans-serif;
+-webkit-border-radius:10px;
+-moz-border-radius:10px;
+-o-border-radius:10px;
+border-radius:10px;
+margin-top:50px;
 }
 
 #menu { display:none;}
@@ -13,10 +18,10 @@ font-size:1.2em;
 color:#555;
 }
 
-p:hover {color:#001;}
+p:hover {color:#003;}
 
 p:hover a {
-background-color:#001 !important;
+background-color:#003 !important;
 color:white !important;
 text-decoration:none !important;
 }
@@ -24,3 +29,7 @@ text-decoration:none !important;
 a {
 color:#334 !important;
 }
+
+h1{color:#003;}
+
+html{background-color:#336;}

data/data/templates/html_5

@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+
+<html lang="en">
+<head>
+  <meta charset="UTF-8">

data/data/templates/main.html

@@ -1,10 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
     <title>Genit - Static web site framework</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" media="all" href="styles/alsa/all.css" /> 
     <link rel="stylesheet" type="text/css" media="screen" href="styles/screen.css" /> 
     <link rel="stylesheet" type="text/css" media="print" href="styles/print.css" /> 

data/data/templates/xhtml_1.0_strict

@@ -0,0 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

data/data/templates/xhtml_1.0_transitional

@@ -0,0 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

data/lib/genit.rb

@@ -1,23 +1,10 @@
 # -*- encoding: utf-8 -*-
-
 require 'genit/extensions'
-require 'genit/project_creator'
-require 'genit/html_document'
-require 'genit/xml_document'
-require 'genit/file_writer'
-require 'genit/document_writer'
-require 'genit/compiler'
-require 'genit/page_compiler'
-require 'genit/builder'
-require 'genit/builder_base'
-require 'genit/menu_builder'
-require 'genit/head_link_builder'
-require 'genit/body_link_builder'
-require 'genit/fragment'
-require 'genit/tag_processor'
-require 'genit/tag'
-require 'genit/var_tag'
-require 'genit/class_tag'
+require 'genit/project'
+require 'genit/documents'
+require 'genit/utils'
+require 'genit/builders'
+require 'genit/tags'
 
 module Genit
 end

data/lib/genit/builders.rb

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+require 'genit/builders/builder'
+require 'genit/builders/builder_base'
+require 'genit/builders/menu_builder'
+require 'genit/builders/head_link_builder'
+require 'genit/builders/body_link_builder'
+require 'genit/builders/img_builder'
+require 'genit/builders/script_builder'

data/lib/genit/{body_link_builder.rb → builders/body_link_builder.rb}

@@ -7,9 +7,9 @@ module Genit
   # Modify links.
   class BodyLinkBuilder < BuilderBase
   
-    # Public: Build the menu of a particular page.
+    # Public: Relativize links.
     #
-    # page_name - The string filename of the page to build menu for.
+    # page_name - The string filename of the page.
     #
     # Returns the modified Nokogiri::XML::Document
     def build_for_page page_name
@@ -24,11 +24,15 @@ module Genit
     
     def update link
       @path = link['href']
-      return if @path =~ URI::regexp
+      return if not_an_internal_link?
       nb = BuilderBase::get_number_of_base_dirs @page_name
       make_relative nb
       link['href'] = @path
     end
+    
+    def not_an_internal_link?
+      @path.nil? or @path =~ URI::regexp
+    end
   
   end
   

data/lib/genit/{head_link_builder.rb → builders/head_link_builder.rb}

@@ -22,11 +22,16 @@ module Genit
     
     def update link
       @path = link['href']
+      return if not_an_internal_link?
       nb = BuilderBase::get_number_of_base_dirs @page_name
       make_relative nb
       link['href'] = @path
     end
     
+    def not_an_internal_link?
+      @path.nil? or @path =~ URI::regexp
+    end
+    
   end
   
 end

data/lib/genit/builders/img_builder.rb

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+
+require 'uri'
+
+module Genit
+
+  # Modify img src.
+  class ImgBuilder < BuilderBase
+  
+    # Public: Relativize image source.
+    #
+    # page_name - The string filename of the page.
+    #
+    # Returns the modified Nokogiri::XML::Document
+    def build_for_page page_name
+      build page_name, get_links
+    end
+    
+    private
+    
+    def get_links
+      @document.css("body img")
+    end
+    
+    def update link
+      @path = link['src']
+      return if not_an_internal_link?
+      nb = BuilderBase::get_number_of_base_dirs @page_name
+      make_relative nb
+      link['src'] = @path
+    end
+    
+    def not_an_internal_link?
+      @path.nil? or @path =~ URI::regexp
+    end
+  
+  end
+  
+end

data/lib/genit/builders/script_builder.rb

@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+
+module Genit
+
+  # Modify script tags.
+  class ScriptBuilder < BuilderBase
+    
+    # Public: Relativize the <script src=""> tags of a particular page.
+    #
+    # page_name - The string filename of the page.
+    #
+    # Returns the modified Nokogiri::XML::Document
+    def build_for_page page_name
+      build page_name, head_links
+    end
+    
+    private
+    
+    def head_links
+      @document.css("script")
+    end
+    
+    def update link
+      @path = link['src']
+      return if not_an_internal_link?
+      nb = BuilderBase::get_number_of_base_dirs @page_name
+      make_relative nb
+      link['src'] = @path
+    end
+    
+    def not_an_internal_link?
+      @path.nil? or @path =~ URI::regexp
+    end
+    
+  end
+  
+end

data/lib/genit/documents.rb

@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+require 'genit/documents/html_document'
+require 'genit/documents/xml_document'
+require 'genit/documents/fragment'
+require 'genit/documents/document_writer'

data/lib/genit/extensions.rb

@@ -1,45 +1,3 @@
 # -*- encoding: utf-8 -*-
-
-class String
-
-  def force_html_extension
-    self.gsub /markdown$/, 'html'
-  end
-  
-  def force_html_extension!
-    self.gsub! /markdown$/, 'html'
-  end
-  
-  def markdown_ext?
-    self.end_with?('.markdown')
-  end
-  
-end
-
-module Nokogiri
-  module XML
-  
-    # I think it's a bad idea to extend the Nokogiri library cause it makes a
-    # too big dependency on Genit.
-    # It will be much better to do a little wrapper over Nokogiri::XML::Node.
-    class Node
-    
-      def genit_class?
-        if self['class']
-          true
-        else
-          false
-        end
-      end
-      
-      def genit_var?
-        if self['var']
-          true
-        else
-          false
-        end
-      end
-      
-    end
-  end
-end
+require 'genit/extensions/string_extension'
+require 'genit/extensions/nokogiri_extension'