genit 0.5 → 0.9

data/lib/genit/{var_tag.rb → tags/here_tag.rb}

@@ -5,7 +5,7 @@ module Genit
   # A Genit tag that represents a variable.
   # For example, in the template you have: <genit var="page_title"/>,
   # and in the page you have: <genit var="page_title">My Title</genit>.
-  class VarTag < Tag
+  class HereTag < Tag
   
     # Public: Constructor.
     #
@@ -29,14 +29,19 @@ module Genit
     private
     
     def get_css_rule
-      var_name = @tag['var']
-      "genit[var='#{var_name}']"
+      var_name = @tag['here']
+      "genit[here='#{var_name}']"
     end
     
     def get_variable_value
       filename = File.join(@working_dir, 'pages', @filename)
-      doc = HtmlDocument.open filename
-      doc.at_css("genit[var='#{@tag['var']}']").inner_html
+      doc = HtmlDocument.open_fragment filename
+      elem = doc.at_css("genit[what='#{@tag['here']}']")
+      if elem.nil?
+        ""
+      else
+        elem.inner_html
+      end
     end
     
   end

data/lib/genit/{tag_processor.rb → tags/tag_processor.rb}

@@ -17,10 +17,11 @@ module Genit
       @template = template
       if tag.genit_class?
         @tag = ClassTag.new(@working_dir, @template, @filename, tag)
-      elsif tag.genit_var?
-        @tag = VarTag.new(@working_dir, @template, @filename, tag)
+      elsif tag.genit_here?
+        @tag = HereTag.new(@working_dir, @template, @filename, tag)
       else
-        raise RuntimeError
+        puts "Genit aborted! Unknown tag: #{tag}"
+        exit 1
       end
     end
     

data/lib/genit/utils.rb

@@ -0,0 +1,2 @@
+# -*- encoding: utf-8 -*-
+require 'genit/utils/file_writer'

data/spec/class_news_tag_spec.rb

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+
+require './spec/helper'
+
+describe ClassNewsTag do
+
+  after :all do
+    clean_test_repository
+  end
+  
+  def create_sample_project
+    FileUtils.makedirs('spec/project-name/news')
+    File.open('spec/project-name/news/2011-01-01.html', "w") {|out| out.puts '<h1>2011-01-01</h1>' }
+    File.open('spec/project-name/news/2011-02-02.html', "w") {|out| out.puts '<h1>2011-02-02</h1>' }
+  end
+
+  it "should replace all news" do
+    create_sample_project
+    template = Nokogiri::XML.fragment '<genit class="news"/>'
+    tag = {'class' => 'news'}
+    cnt = ClassNewsTag.new 'spec/project-name', template, 'mock', tag
+    doc = cnt.process
+    doc.css('h1').size.should == 2
+  end
+  
+  it "should replace X news" do
+    create_sample_project
+    template = Nokogiri::XML.fragment '<genit class="news" number="1"/>'
+    tag = {'class' => 'news', 'number' => '1'}
+    cnt = ClassNewsTag.new 'spec/project-name', template, 'mock', tag
+    doc = cnt.process
+    doc.css('h1').size.should == 1
+    doc.css('h1').inner_html.should == '2011-02-02'
+  end
+
+end

data/spec/class_tag_spec.rb

@@ -0,0 +1,13 @@
+# -*- encoding: utf-8 -*-
+
+require './spec/helper'
+
+describe ClassTag do
+
+  it "should raise error if class is unknown" do
+    tag = {'class' => 'unknown'}
+    ct = ClassTag.new 'mock', 'mock', 'mock', tag
+    lambda{ct.process}.should raise_error(RuntimeError)
+  end
+
+end

data/spec/compiler_spec.rb

@@ -5,7 +5,7 @@ require './spec/helper'
 describe Compiler do
 
   before :all do
-    @project = ProjectCreator.new('spec/project-name')
+    @project = ProjectCreator.new('spec/project-name', 'html_5', false)
     @project.create
     @compiler = Compiler.new File.expand_path('spec/project-name')
   end

data/spec/menu_builder_spec.rb

@@ -34,20 +34,6 @@ describe MenuBuilder do
     new_menu.css("ul#menu a#selected").first['href'].should == 'about.html'
   end
   
-  #~ it "should set the menu for doc/index.html page" do
-    #~ builder = MenuBuilder.new(@menu_doc)
-    #~ new_menu = builder.build_for_page('doc/index.html')
-    #~ new_menu.css("ul#menu a#selected").size.should == 1
-    #~ new_menu.css("ul#menu a#selected").first['href'].should == '../doc/index.html'
-  #~ end
-  #~ 
-  #~ it "should set the menu for a/b/c2.html page" do
-    #~ builder = MenuBuilder.new(@menu_doc)
-    #~ new_menu = builder.build_for_page('a/b/c2.html')
-    #~ new_menu.css("ul#menu a#selected").size.should == 1
-    #~ new_menu.css("ul#menu a#selected").first['href'].should == '../../a/b/c2.html'
-  #~ end
-  
   it "should set the menu for /absolute.html page" do
     builder = MenuBuilder.new(@menu_doc)
     new_menu = builder.build_for_page('/absolute.html')

data/spec/page_compiler_spec.rb

@@ -11,15 +11,14 @@ describe PageCompiler do
   def create_sample_project
     FileUtils.makedirs('spec/project-name/templates')
     FileUtils.makedirs('spec/project-name/pages')
-    File.open('spec/project-name/templates/main.html', "w") {|out| out.puts '<h1><genit var="title"/></h1>' }
-    File.open('spec/project-name/pages/index.html', "w") {|out| out.puts '<genit var="title">My Title</genit>' }
+    File.open('spec/project-name/templates/main.html', "w") {|out| out.puts '<h1><genit here="title"/></h1>' }
+    File.open('spec/project-name/pages/index.html', "w") {|out| out.puts '<genit what="title">My Title</genit>' }
   end
   
   it "should substitute a variable" do
     create_sample_project
     pc = PageCompiler.new 'spec/project-name/', 'index.html'
     doc = pc.compile
-    
     doc.at_css('h1').inner_html.should == 'My Title'
   end
   
@@ -29,7 +28,7 @@ describe PageCompiler do
     doc = pc.compile
     
     page = IO.read 'spec/project-name/pages/index.html'
-    page.match('<genit var="title">My Title</genit>').should_not == nil
+    page.match('<genit what="title">My Title</genit>').should_not be_nil
   end
 
 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')
+    @project = ProjectCreator.new('spec/project-name', 'html_5', false)
     @project.create
   end
   
@@ -20,7 +20,7 @@ describe ProjectCreator do
     end
     
     it "should say it if it cannot create a project" do
-      project = ProjectCreator.new('/root/project')
+      project = ProjectCreator.new('/root/project', 'html_5', false)
       $stdout.should_receive(:puts).with("Cannot create project...")
       project.create
     end
@@ -72,6 +72,10 @@ describe ProjectCreator do
     it "should create a images folder inside the styles" do
       File.exist?('spec/project-name/styles/images').should == true
     end
+    
+    it "should create a public folder" do
+      File.exist?('spec/project-name/public').should == true
+    end
   
   end # "Folder structure"
   

data/spec/tag_processor_spec.rb

@@ -4,5 +4,13 @@ require './spec/helper'
 
 describe TagProcessor do
 
+  it "should abort on unknown tag" do
+    doc = Nokogiri::XML.fragment('<body><genit foo="bar"/></body>')
+    tag = doc.at_css('genit')
+    STDOUT.should_receive(:puts).with("Genit aborted! Unknown tag: <genit foo=\"bar\"/>")
+    lambda do
+      TagProcessor.new('mock', 'mock', 'mock', tag)
+    end.should raise_error(SystemExit)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genit
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.9'
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-06 00:00:00.000000000 +02:00
+date: 2011-09-04 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coco
-  requirement: &72437520 !ruby/object:Gem::Requirement
+  requirement: &72980010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *72437520
+  version_requirements: *72980010
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &72437120 !ruby/object:Gem::Requirement
+  requirement: &72979620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *72437120
+  version_requirements: *72979620
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &72436670 !ruby/object:Gem::Requirement
+  requirement: &72979050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72436670
+  version_requirements: *72979050
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &72436180 !ruby/object:Gem::Requirement
+  requirement: &72978470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *72436180
+  version_requirements: *72978470
 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,
@@ -68,26 +68,42 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/genit/head_link_builder.rb
-- lib/genit/project_creator.rb
-- lib/genit/var_tag.rb
-- lib/genit/html_document.rb
-- lib/genit/builder.rb
-- lib/genit/file_writer.rb
-- lib/genit/xml_document.rb
-- lib/genit/menu_builder.rb
-- lib/genit/tag_processor.rb
-- lib/genit/builder_base.rb
-- lib/genit/page_compiler.rb
-- lib/genit/fragment.rb
-- lib/genit/tag.rb
-- lib/genit/body_link_builder.rb
-- lib/genit/class_tag.rb
-- lib/genit/compiler.rb
+- lib/genit/project/project_creator.rb
+- lib/genit/project/page_compiler.rb
+- lib/genit/project/compiler.rb
+- lib/genit/builders/head_link_builder.rb
+- lib/genit/builders/builder.rb
+- lib/genit/builders/menu_builder.rb
+- lib/genit/builders/builder_base.rb
+- lib/genit/builders/script_builder.rb
+- lib/genit/builders/img_builder.rb
+- lib/genit/builders/body_link_builder.rb
+- lib/genit/tags.rb
+- lib/genit/project.rb
+- lib/genit/documents/html_document.rb
+- lib/genit/documents/xml_document.rb
+- lib/genit/documents/fragment.rb
+- lib/genit/documents/document_writer.rb
+- lib/genit/utils/file_writer.rb
+- lib/genit/builders.rb
+- lib/genit/utils.rb
+- lib/genit/tags/class_menu_tag.rb
+- lib/genit/tags/class_news_tag.rb
+- lib/genit/tags/class_fragment_tag.rb
+- lib/genit/tags/here_tag.rb
+- lib/genit/tags/class_pages_tag.rb
+- lib/genit/tags/tag_processor.rb
+- lib/genit/tags/tag.rb
+- lib/genit/tags/class_tag.rb
 - lib/genit/extensions.rb
-- lib/genit/document_writer.rb
+- lib/genit/documents.rb
+- lib/genit/extensions/string_extension.rb
+- lib/genit/extensions/nokogiri_extension.rb
 - lib/genit.rb
 - bin/genit
+- data/templates/xhtml_1.0_strict
+- data/templates/html_5
+- data/templates/xhtml_1.0_transitional
 - data/templates/menu.html
 - data/templates/main.html
 - data/styles/handheld.css
@@ -99,6 +115,7 @@ files:
 - data/styles/yui/base.css
 - data/styles/yui/fonts.css
 - data/pages/index.html
+- data/pages/index2.html
 - spec/file_writer_spec.rb
 - spec/compiler_spec.rb
 - spec/tag_processor_spec.rb
@@ -123,7 +140,9 @@ files:
 - spec/test-files/fragments/title.markdown
 - spec/test-files/fragments/d.html
 - spec/test-files/nothing.html
+- spec/class_news_tag_spec.rb
 - spec/page_compiler_spec.rb
+- spec/class_tag_spec.rb
 - spec/xml_document_spec.rb
 - VERSION
 - NEWS

data/lib/genit/class_tag.rb

@@ -1,66 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-module Genit
-
-  # A Genit general tag.
-  # Currently we have three tags:
-  #   * <genit class="pages"/>
-  #   * <genit class="menu"/>
-  #   * <genit class="fragment" file="foo.html"/>
-  class ClassTag < Tag
-  
-    # Public: Constructor.
-    #
-    # working_dir - The String working directory, where live the project.
-    # template    - The Nokogiri::XML::Document into which we process the tag.
-    # filename    - The String name of the page
-    # tag         - The tag to process as a Nokogiri::XML::Element
-    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
-    def process
-      case @tag['class']
-        when 'pages' then process_tag_pages
-        when 'menu' then process_tag_menu
-        when 'fragment' then process_fragment
-        else
-          raise RuntimeError
-      end
-    end
-    
-    private
-    
-    def process_tag_pages
-      replace_tag_into_template! 'genit.pages', page_content
-    end
-    
-    def page_content
-      filename = File.join(@working_dir, 'pages', @filename)
-      HtmlDocument.build_page_content filename, @working_dir
-    end
-    
-    def process_tag_menu
-      build_menu
-      replace_tag_into_template! 'genit.menu', @menu.to_html
-    end
-    
-    def build_menu
-      menu = XmlDocument.open(File.join(@working_dir, "templates/menu.html"))
-      builder = MenuBuilder.new(menu)
-      @menu = builder.build_for_page(@filename)
-    end
-    
-    def process_fragment
-      file = @tag['file']
-      fragment = HtmlDocument.build_page_content(File.join(@working_dir, 'fragments', file), @working_dir)
-      css_rule = "genit.fragment[file='#{file}']"
-      replace_tag_into_template! css_rule, fragment.to_s
-    end
-    
-  end
-
-end

data/lib/genit/project_creator.rb

@@ -1,72 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-require "fileutils"
-
-module Genit
-
-  # Create a skeleton project.
-  class ProjectCreator
-  
-    # Sole constructor.
-    #
-    # name  - The String name of the future project folder.
-    def initialize name
-      @name = name
-    end
-    
-    # Public: Create the structure of the project, that is many
-    # files and folders.
-    #
-    # Returns nothing.
-    def create
-      begin
-        FileUtils.makedirs @name
-        create_dirs ['fragments', 'news', 'pages', 'scripts', 'styles', 'templates', 'www',
-                     'styles/alsa', 'styles/yui', 'styles/images']
-        copy_files ['templates/main.html', 'templates/menu.html',
-                    'pages/index.html', 'styles/handheld.css', 'styles/print.css',
-                    'styles/screen.css', 'styles/alsa/all.css', 'styles/yui/all.css', 'styles/yui/base.css',
-                    'styles/yui/fonts.css', 'styles/yui/reset.css']
-        FileUtils.touch "#{@name}/.genit"
-      rescue SystemCallError
-        puts "Cannot create project..."
-      end
-    end
-    
-    private
-    
-    # Create some subfolders inside the project folder.
-    #
-    # a_array - An Array of String subfolder names
-    #
-    # Examples
-    #
-    #   create_dirs ['styles', 'scripts']
-    #
-    #   create_dirs ['styles/css/alsa', 'styles/css/yui', 'styles/css/images']
-    #
-    # Returns nothing.
-    def create_dirs a_array
-      a_array.each {|dir| FileUtils.makedirs File.join(@name, dir) }
-    end
-    
-    # Copy files to project.
-    #
-    # a_array - An Array of String "subfolder/file" names
-    #
-    # Example
-    #
-    #   copy_files ['templates/main.html', 'pages/index.html']
-    #
-    # Returns nothing.
-    def copy_files a_array
-      a_array.each do |file|
-        src = File.join $GENIT_PATH, 'data', file
-        dest =  File.join @name, file
-        FileUtils.cp src, dest
-      end
-    end
-    
-  end
-
-end