rblosxom 0.1.2 → 0.1.3

data/ChangeLog

@@ -1,3 +1,9 @@
+2011-01-01  Percy Lau  <percy.lau@gmail.com> 0.1.3
+    * Added wiki_render, Up to ruby1.9
+
+2010-03-22  Percy Lau  <percy.lau@gmail.com> 0.1.3b
+    * Added itsucks-compass-960-plugin
+
 2010-01-19  Percy Lau  <percy.lau@gmail.com> 0.1.2
     * Added logger handler, category_list and archive_list helper
 

data/INSTALL

@@ -1,25 +1,26 @@
-INSTALL
--------
+== INSTALL
 
 安装 rblosxom gem:
 $ gem install rblosxom --source http://gemcutter.org
 
 运行 demo:
-$ rbloxom-demo
+$ rblosxom-demo
 
 通过浏览器访问 http://127.0.0.1:7878/
 
-HACKING
--------
+== HACKING
 
 下载 source
-$ hg clone https://itsucks@bitbucket.org/itsucks/rblosxom
+$ hg clone https://pernn@bitbucket.org/pernn/rblosxom
 
-需要安装 sinatra, haml, rdiscount, compass, compass-960-plugin
-$ gem install sinatra, haml, rdiscount, compass, compass-960-plugin
+安装 rack, sinatra, haml, rdiscount, itsucks-compass-960-plugin
+$ gem install sinatra, haml, rdiscount, itsucks-compass-960-plugin
 
 定制 theme:
 $ compass -r ninesixty -f 960 --sass-dir=sass --css-dir=stylesheets --javascript-dir=javascripts --images-dir=images public
 
 更新 css:
 $ compass -u public
+
+运行:
+$ rackup config/rackup.ru

data/Manifest

@@ -0,0 +1,32 @@
+AUTHORS
+ChangeLog
+INSTALL
+MIT-LICENSE
+Manifest
+README.mkd
+Rakefile
+VERSION
+bin/rblosxom-demo
+config/rackup.ru
+demo/grid.rb
+demo/main.rb
+demo/wiki_render.rb
+lib/rblosxom.rb
+lib/rblosxom/base.rb
+public/config.rb
+public/images/12_col.gif
+public/images/16_col.gif
+public/sass/grid.sass
+public/sass/screen.sass
+public/stylesheets/grid.css
+public/stylesheets/screen.css
+rblosxom.gemspec
+views/footer.haml
+views/grid.haml
+views/header.haml
+views/index.haml
+views/layout.haml
+views/404.haml
+views/500.haml
+views/wiki.haml
+views/wikis.haml

data/{README.rdoc → README.mkd}

@@ -6,8 +6,6 @@
 - [rdiscount][rdiscount]
 - [compass-960][compass_960]
 
-目前版本0.1.2
-
 Author
 ------
 Percy Lau <percy.lau@gmail.com>
@@ -30,7 +28,7 @@ Released under [MIT License][license].
 [haml]: http://haml.hamptoncatlin.com/
 [rdiscount]: http://github.com/rtomayko/rdiscount/
 [compass_960]: http://github.com/chriseppstein/compass-960-plugin/
-[rblosxom]: http://bitbucket.org/itsucks/rblosxom/
-[license]: http://bitbucket.org/itsucks/rblosxom/src/tip/MIT-LICENSE
-[install]: http://bitbucket.org/itsucks/rblosxom/src/tip/INSTALL
-[changelog]: http://bitbucket.org/itsucks/rblosxom/src/tip/ChangeLog
+[rblosxom]: http://bitbucket.org/pernn/rblosxom/
+[license]: http://bitbucket.org/pernn/rblosxom/src/tip/MIT-LICENSE
+[install]: http://bitbucket.org/pernn/rblosxom/src/tip/INSTALL
+[changelog]: http://bitbucket.org/pernn/rblosxom/src/tip/ChangeLog

data/Rakefile

@@ -0,0 +1,18 @@
+begin
+  require 'echoe'
+ 
+  Echoe.new('rblosxom', open('VERSION').read) do |p|
+    p.summary = "Ruby based blosxom."
+    p.description = "Rblosxom is a blosxom program written in ruby."
+    p.url = "http://rblosxom.heroku.com"
+    p.author = ['Percy Lau']
+    p.email = "percy.lau@gmail.com"
+    p.runtime_dependencies = ['sinatra', 'haml', 'rdiscount']
+    p.development_dependencies = ['itsucks-compass-960-plugin']
+    p.has_rdoc = false
+  end
+ 
+rescue LoadError => boom
+  puts "You are missing a dependency required for meta-operations on this gem."
+  puts "#{boom.to_s.capitalize}."
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.3

data/config/rackup.ru

@@ -1,7 +1,10 @@
 require 'sinatra'
+require 'logger'
 begin
     require 'rblosxom'
 rescue LoadError => e
+    topdir = File.expand_path("../", File.dirname(__FILE__))
+    $LOAD_PATH.unshift(topdir) unless $LOAD_PATH.include?(topdir)
     require 'lib/rblosxom'
 end
 
@@ -11,6 +14,7 @@ set :environment, :development
 $LOAD_PATH.unshift File.expand_path("../demo", File.dirname(__FILE__))
 
 require 'main'
+Rblosxom::Main.log_level = Logger::DEBUG
 map "/" do
     run Rblosxom::Main
 end
@@ -19,3 +23,8 @@ require 'grid'
 map '/grid' do
     run Rblosxom::Grid
 end
+
+require 'wiki_render'
+map '/wiki' do
+    run Rblosxom::Wiki
+end

data/demo/main.rb

@@ -5,8 +5,9 @@ module Rblosxom
         get '/?' do
             set_common_variables
             @log.info "Main start"
-            content = File.read(File.expand_path("../README.rdoc", File.dirname(__FILE__)))
-            haml :index, :layout => true, :locals => { :readme => content }
+            @log.debug "Main debug"
+            content = File.read(File.expand_path("../README.mkd", File.dirname(__FILE__)))
+            haml :index, :layout => true, :locals => { :content => content }
         end
     end
 end

data/demo/wiki_render.rb

@@ -0,0 +1,67 @@
+require 'rblosxom/base'
+require 'rdiscount'
+
+module Rblosxom
+    class Base < Sinatra::Base
+        not_found do
+            haml :'404', :layout => false
+        end
+
+        error do
+            haml :'500', :layout => false
+        end
+
+        helpers do
+            def title
+                File.basename(Dir.getwd).gsub(/_/, ' ')
+            end
+
+            def pages
+                (Dir["**/*.mkd"] + Dir["**/*.markdown"] + Dir["**/*.textile"]).sort
+            end
+        end
+    end
+
+    class Wiki < Base
+        get '/?' do
+            set_common_variables
+            @log.info "Wiki Render start"
+            @log.debug "Wiki Render debug"
+
+            # If there is only one file present, serve that instantly.`
+            redirect "/wiki/#{pages.first}", 302 if pages.size == 1
+
+            haml :wikis, :layout => true
+        end
+
+        page_regex = '(?:/[.\w]+)+'
+        page_url = %r@^(#{page_regex})\b$@
+        get page_url do
+            set_common_variables
+            @log.info "Wiki Render #{request.env["PATH_INFO"]}"
+            @log.info "Wiki Render #{params[:captures]}"
+
+            request_file = request.env["PATH_INFO"][1..-1]
+            begin
+                content = File.open(request_file) do |file|
+                    ext = request_file.split(".")[-1];
+                    case ext
+                        when "markdown", "mkd"
+                          RDiscount.new(file.read).to_html
+                        when "textile"
+                          RedCloth.new(file.read).to_html
+                        else
+                          file.read
+                    end
+               end
+                haml :wiki, :layout => true, :locals => { :content => content }
+            rescue
+                #raise Sinatra::NotFound
+                halt 404, 'page not found!'
+            end
+        end
+    end
+end
+
+# vim: ft=ruby:fenc=utf-8:sw=4:ts=4:sts=4:et:
+# wiki_render.rb end here

data/lib/rblosxom/base.rb

@@ -14,7 +14,7 @@ module Rblosxom
 
     module Helpers
         def set_common_variables
-            require 'ftools'
+            require 'fileutils'
             require 'logger'
             @config = options.config
             @log = Proc.new {
@@ -32,7 +32,7 @@ module Rblosxom
                     log = Logger.new(STDOUT)
                 end
                 log.progname = "#{::Rblosxom.name}"
-                log.level = Logger::INFO
+                log.level = options.log_level ? options.log_level : Logger::INFO
                 log.datetime_format = "%Y-%m-%d %H:%M:%S %Z "
                 log
             }.call
@@ -86,6 +86,7 @@ module Rblosxom
         class << self
             attr_accessor :config_file
             attr_accessor :log_file
+            attr_accessor :log_level
             attr_reader :config
         end
         set :config, Proc.new { config_file ? YAML::load(File.read(config_file)) : CONFIG }

data/public/config.rb

@@ -0,0 +1,13 @@
+require 'ninesixty'
+# Require any additional compass plugins here.
+
+project_type = :stand_alone
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "stylesheets"
+sass_dir = "sass"
+images_dir = "images"
+javascripts_dir = "javascripts"
+output_style = :compact
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true

data/public/sass/grid.sass

@@ -1,11 +1,17 @@
-//  Layout
-//  %body
-//    #wrap
-//      #header
-//      #main.clearfix
-//        .g12
-//        .g16
-//    #footer
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+  
+  Licensed under GPL and MIT.
+
+/*  Layout
+/*  %body
+/*    #wrap
+/*      #header
+/*      #main.clearfix
+/*        .g12
+/*        .g16
+/*    #footer
 
 /* @import compass/reset.sass
 /* +global-reset
@@ -15,9 +21,8 @@
 @import 960/text.sass
 +text
 
-@import _grid.sass
-@import _debug.sass
-@import _sticky_footer.sass
+@import 960/debug.sass
+@import 960/sticky_footer.sass
 
 !background_color = #123
 !text_color = #27261f
@@ -78,6 +83,6 @@ body
 
 +sticky-footer(!footer_height, "#wrap", "#main", "#footer")
 
-// Debug
-+showgrid(".g12")
-+showgrid(".g16", !col_16)
+/* Debug
++showgrid_12(".g12")
++showgrid_16(".g16")

data/public/sass/screen.sass

@@ -1,12 +1,19 @@
-//  Layout
-//  %body
-//    #wrap
-//      #header
-//      #main.clearfix
-//        .g12
-//          .content
-//          .sidebar
-//    #footer
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+  
+  Licensed under GPL and MIT.
+
+/*
+  Layout
+    %body
+      #wrap
+        #header
+        #main.clearfix
+          .g12
+            .content
+            .sidebar
+      #footer
 
 /* @import compass/reset.sass
 /* +global-reset
@@ -16,12 +23,11 @@
 @import 960/text.sass
 +text
 
-@import _grid.sass
-@import _debug.sass
-@import _sticky_footer.sass
+@import 960/debug.sass
+@import 960/sticky_footer.sass
 
-!background_color = white
-!text_color = #666
+!background_color = #F1F1F1
+!text_color = black
 !header_height = 80px
 !footer_height = 3em
 
@@ -40,20 +46,25 @@ body
   +grid-pushs
   +grid-pulls
   +grid-children
+  :-moz-border-radius 10px
+  :-webkit-border-radius 10px
+  :background-color white
+  :padding-top 1em
+  :border 3px solid #CCC
 
 #header
   :height= !header_height
-  :border-bottom 2px solid #F90
   h1
     +grid(6,12)
-    :color #F90
     :letter-spacing -1px
     :margin 30px 0px 0px 15px
     :padding 0
     :font-weight normal
+    :color #383
     span
+      :color black
       :font-size 16px
-      :color #FFC875
+      :color #CCC
   ul
     +grid(6,12)
     :list-style-type none
@@ -65,29 +76,25 @@ body
       :display inline
       :margin 0 0 0 10px
       a
-        :text-decoration none
-        :color #999
-        :font-weight bold
         &.active
           :text-decoration none
-          :color #F90
           :font-weight bold
         &:hover
           :text-decoration none
-          :color #333
 
 #main
+  a
+    &:hover
+      :text-decoration none
   p
     :margin 0 15px 15px 15px
   h1
-    :color #F90
     :font-size 140%
   h2, h3
     :margin 0 0 15px 0
     :padding 5px 15px
     :font-size 120%
     :font-weight normal
-    :color #F90
     :border-bottom 1px solid #E5E5E5
   .content
     +grid(9,12)
@@ -106,13 +113,8 @@ body
 #footer
   .inner
     +grid(12,12)
-    :border-top 2px solid #F90
-    :color #999
     a
-      :color #999
-      :text-decoration none
       &:hover
-        :color #F90
         :text-decoration none
     .left
       :float left
@@ -122,5 +124,5 @@ body
 
 +sticky-footer(!footer_height, "#wrap", "#main", "#footer")
 
-// Debug
-/* +showgrid(".g12")
+/* Debug
+/* +showgrid_12(".g12")

data/public/stylesheets/grid.css

@@ -1,3 +1,12 @@
+/* 960 Grid System ~ Core CSS. Learn more ~ http://960.gs/ Licensed under GPL and MIT. */
+/* Layout */
+/* %body */
+/* #wrap */
+/* #header */
+/* #main.clearfix */
+/* .g12 */
+/* .g16 */
+/* #footer */
 /* @import compass/reset.sass */
 /* +global-reset */
 body { font: 13px/1.5 Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif; }
@@ -26,10 +35,6 @@ li { margin-left: 30px; }
 
 p, dl, hr, h1, h2, h3, h4, h5, h6, ol, ul, pre, table, address, fieldset { margin-bottom: 20px; }
 
-/* add 960 pull, push classes */
-
-/* selector= container */
-
 body { background-color: #112233; color: #27261f; }
 
 #header, #footer, .g12, .g16 { margin-left: auto; margin-right: auto; width: 960px; overflow: hidden; display: inline-block; }
@@ -205,6 +210,7 @@ body > #wrap { height: auto; min-height: 100%; }
 .clearfix { display: block; }
 
 /* End hide from IE-mac */
-.g12 { background-image: url('/images/12_col.gif?1261547183'); background-repeat: repeat-y; }
+/* Debug */
+.g12 { background-image: url('/images/12_col.gif?1269189232'); background-repeat: repeat-y; }
 
-.g16 { background-image: url('/images/16_col.gif?1261547183'); background-repeat: repeat-y; }
+.g16 { background-image: url('/images/16_col.gif?1269189232'); background-repeat: repeat-y; }

data/public/stylesheets/screen.css

@@ -1,3 +1,5 @@
+/* 960 Grid System ~ Core CSS. Learn more ~ http://960.gs/ Licensed under GPL and MIT. */
+/* Layout   %body     #wrap       #header       #main.clearfix         .g12           .content           .sidebar     #footer */
 /* @import compass/reset.sass */
 /* +global-reset */
 body { font: 13px/1.5 Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif; }
@@ -26,15 +28,12 @@ li { margin-left: 30px; }
 
 p, dl, hr, h1, h2, h3, h4, h5, h6, ol, ul, pre, table, address, fieldset { margin-bottom: 20px; }
 
-/* add 960 pull, push classes */
-
-/* selector= container */
-
-body { background-color: white; color: #666666; }
+body { background-color: #f1f1f1; color: black; }
 
 #header, #footer, .g12 { margin-left: auto; margin-right: auto; width: 960px; overflow: hidden; display: inline-block; }
 #header, #footer, .g12 { display: block; }
 
+.g12 { -moz-border-radius: 10px; -webkit-border-radius: 10px; background-color: white; padding-top: 1em; border: 3px solid #CCC; }
 .g12 .grid_1, .g12 .grid_2, .g12 .grid_3, .g12 .grid_4, .g12 .grid_5, .g12 .grid_6, .g12 .grid_7, .g12 .grid_8, .g12 .grid_9, .g12 .grid_10, .g12 .grid_11, .g12 .grid_12 { display: inline; float: left; margin-left: 10px; margin-right: 10px; }
 .g12 .grid_1 { width: 60px; }
 .g12 .grid_2 { width: 140px; }
@@ -95,26 +94,25 @@ body { background-color: white; color: #666666; }
 .g12 .alpha { margin-left: 0; }
 .g12 .omega { margin-right: 0; }
 
-#header { height: 80px; border-bottom: 2px solid #F90; }
-#header h1 { display: inline; float: left; margin-left: 10px; margin-right: 10px; width: 460px; color: #F90; letter-spacing: -1px; margin: 30px 0px 0px 15px; padding: 0; font-weight: normal; }
-#header h1 span { font-size: 16px; color: #FFC875; }
+#header { height: 80px; }
+#header h1 { display: inline; float: left; margin-left: 10px; margin-right: 10px; width: 460px; letter-spacing: -1px; margin: 30px 0px 0px 15px; padding: 0; font-weight: normal; color: #383; }
+#header h1 span { color: black; font-size: 16px; color: #CCC; }
 #header ul { display: inline; float: left; margin-left: 10px; margin-right: 10px; width: 460px; list-style-type: none; text-align: right; color: #CCC; padding: 0; margin: 40px 15px 0 0; }
 #header ul li { display: inline; margin: 0 0 0 10px; }
-#header ul li a { text-decoration: none; color: #999; font-weight: bold; }
-#header ul li a.active { text-decoration: none; color: #F90; font-weight: bold; }
-#header ul li a:hover { text-decoration: none; color: #333; }
+#header ul li a.active { text-decoration: none; font-weight: bold; }
+#header ul li a:hover { text-decoration: none; }
 
+#main a:hover { text-decoration: none; }
 #main p { margin: 0 15px 15px 15px; }
-#main h1 { color: #F90; font-size: 140%; }
-#main h2, #main h3 { margin: 0 0 15px 0; padding: 5px 15px; font-size: 120%; font-weight: normal; color: #F90; border-bottom: 1px solid #E5E5E5; }
+#main h1 { font-size: 140%; }
+#main h2, #main h3 { margin: 0 0 15px 0; padding: 5px 15px; font-size: 120%; font-weight: normal; border-bottom: 1px solid #E5E5E5; }
 #main .content { display: inline; float: left; margin-left: 10px; margin-right: 10px; width: 700px; }
 #main .content img { border: 1px solid #CDCDCD; float: left; margin: 0px 15px 5px; padding: 5px; }
 #main .sidebar { display: inline; float: left; margin-left: 10px; margin-right: 10px; width: 220px; }
 #main .sidebar p.title { margin: 0px 20px; font-weight: bold; font-style: oblique; }
 
-#footer .inner { display: inline; float: left; margin-left: 10px; margin-right: 10px; width: 940px; border-top: 2px solid #F90; color: #999; }
-#footer .inner a { color: #999; text-decoration: none; }
-#footer .inner a:hover { color: #F90; text-decoration: none; }
+#footer .inner { display: inline; float: left; margin-left: 10px; margin-right: 10px; width: 940px; }
+#footer .inner a:hover { text-decoration: none; }
 #footer .inner .left { float: left; }
 #footer .inner .right { float: right; text-align: right; }
 
@@ -138,4 +136,5 @@ body > #wrap { height: auto; min-height: 100%; }
 .clearfix { display: block; }
 
 /* End hide from IE-mac */
-/* +showgrid(".g12") */
+/* Debug */
+/* +showgrid_12(".g12") */

data/rblosxom.gemspec

@@ -1,41 +1,44 @@
-Gem::Specification.new do |s|
-  s.name = 'rblosxom'
-  s.version = '0.1.2'
-  s.date = '2010-01-19'
+# -*- encoding: utf-8 -*-
 
-  s.description = "Ruby based Blosxom."
-  s.summary     = "rblosxom is a Blosxom program written in ruby."
+Gem::Specification.new do |s|
+  s.name = %q{rblosxom}
+  s.version = "0.1.3"
 
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Percy Lau"]
-  s.email = "percy.lau@gmail.com"
-  s.requirements << 'Ruby, version 1.8.0 (or newer)'
-
-  # = MANIFEST =
-  s.files = Dir["lib/**/*.rb", 
-	  "bin/rblosxom-demo",
-	  "README.rdoc", 
-	  "INSTALL", 
-	  "ChangeLog", 
-	  "MIT-LICENSE", 
-	  "AUTHORS", 
-	  "config/rackup.ru",
-	  "demo/*.rb",
-	  "public/**/*.gif",
-	  "public/**/*.sass",
-	  "public/**/*.css",
-	  "views/**/*.haml",
-	  "rblosxom.gemspec"]
-  # = MANIFEST =
-
+  s.date = %q{2011-01-01}
+  s.default_executable = %q{rblosxom-demo}
+  s.description = %q{Rblosxom is a blosxom program written in ruby.}
+  s.email = %q{percy.lau@gmail.com}
   s.executables = ["rblosxom-demo"]
-  s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE]
-  s.add_dependency 'sinatra',    '>= 0.9.4'
-  s.add_dependency 'haml',    '>= 2.2.14'
-  s.add_dependency 'rdiscount',    '>= 1.5.5'
-  s.add_development_dependency 'compass-960-plugin', '>= 0.9.11',   '< 1.0'
+  s.extra_rdoc_files = ["README.mkd", "bin/rblosxom-demo", "lib/rblosxom.rb", "lib/rblosxom/base.rb"]
+  s.files = ["AUTHORS", "ChangeLog", "INSTALL", "MIT-LICENSE", "Manifest", "README.mkd", "Rakefile", "VERSION", "bin/rblosxom-demo", "config/rackup.ru", "demo/grid.rb", "demo/main.rb", "demo/wiki_render.rb", "lib/rblosxom.rb", "lib/rblosxom/base.rb", "public/config.rb", "public/images/12_col.gif", "public/images/16_col.gif", "public/sass/grid.sass", "public/sass/screen.sass", "public/stylesheets/grid.css", "public/stylesheets/screen.css", "rblosxom.gemspec", "views/footer.haml", "views/grid.haml", "views/header.haml", "views/index.haml", "views/layout.haml", "views/404.haml", "views/500.haml", "views/wiki.haml", "views/wikis.haml"]
+  s.homepage = %q{http://rblosxom.heroku.com}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rblosxom", "--main", "README.mkd"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rblosxom}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Ruby based blosxom.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
 
-  s.has_rdoc = true
-  s.homepage = "http://rblosxom.heroku.com/"
-  s.rubygems_version = '1.3.5'
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "#{s.name} #{s.version}", "--main", "README.rdoc", "--webcvs", "http://bitbucket.org/itsucks/#{s.name}"]
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<haml>, [">= 0"])
+      s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
+      s.add_development_dependency(%q<itsucks-compass-960-plugin>, [">= 0"])
+    else
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<rdiscount>, [">= 0"])
+      s.add_dependency(%q<itsucks-compass-960-plugin>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<rdiscount>, [">= 0"])
+    s.add_dependency(%q<itsucks-compass-960-plugin>, [">= 0"])
+  end
 end

data/views/404.haml

@@ -0,0 +1,2 @@
+%div
+  404, Page Not Found.

data/views/500.haml

@@ -0,0 +1,2 @@
+%div
+  500, Internel Server Error.

data/views/grid.haml

@@ -225,6 +225,7 @@
             .grid_7.omega
               %p 400
     #footer
-      %p
-        generated with
-        = @footer[:generator]
+      .inner
+        %p
+          generated with
+          = @footer[:generator]

data/views/index.haml

@@ -3,6 +3,7 @@
   #main.clearfix
     .g12
       :markdown
-        #{readme}
+        #{content}
 
-#footer= haml :footer, :layout => false, :locals => { }
+#footer
+  .inner= haml :footer, :layout => false, :locals => { }

data/views/wiki.haml

@@ -0,0 +1,8 @@
+#wrap
+  #header= haml :header, :layout => false
+  #main.clearfix
+    .g12
+      #{content}
+
+#footer
+  .inner= haml :footer, :layout => false, :locals => { }

data/views/wikis.haml

@@ -0,0 +1,11 @@
+#wrap
+  #header= haml :header, :layout => false
+  #main.clearfix
+    .g12
+      %ul
+        - pages.each do |page|
+          %li
+            %a{:href => "wiki/#{page}"}= page
+
+#footer
+  .inner= haml :footer, :layout => false, :locals => { }

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rblosxom
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Percy Lau
@@ -9,90 +14,107 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 +08:00
+date: 2011-01-01 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.14
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rdiscount
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.5
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: compass-960-plugin
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: itsucks-compass-960-plugin
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.11
-    - - <
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-description: Ruby based Blosxom.
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: Rblosxom is a blosxom program written in ruby.
 email: percy.lau@gmail.com
 executables: 
 - rblosxom-demo
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
-- MIT-LICENSE
-files: 
-- lib/rblosxom/base.rb
-- lib/rblosxom.rb
+- README.mkd
 - bin/rblosxom-demo
-- README.rdoc
-- INSTALL
+- lib/rblosxom.rb
+- lib/rblosxom/base.rb
+files: 
+- AUTHORS
 - ChangeLog
+- INSTALL
 - MIT-LICENSE
-- AUTHORS
+- Manifest
+- README.mkd
+- Rakefile
+- VERSION
+- bin/rblosxom-demo
 - config/rackup.ru
 - demo/grid.rb
 - demo/main.rb
+- demo/wiki_render.rb
+- lib/rblosxom.rb
+- lib/rblosxom/base.rb
+- public/config.rb
 - public/images/12_col.gif
 - public/images/16_col.gif
-- public/sass/_sticky_footer.sass
-- public/sass/_grid.sass
 - public/sass/grid.sass
-- public/sass/_debug.sass
 - public/sass/screen.sass
-- public/stylesheets/screen.css
 - public/stylesheets/grid.css
-- views/header.haml
+- public/stylesheets/screen.css
+- rblosxom.gemspec
+- views/footer.haml
 - views/grid.haml
-- views/layout.haml
+- views/header.haml
 - views/index.haml
-- views/footer.haml
-- rblosxom.gemspec
+- views/layout.haml
+- views/404.haml
+- views/500.haml
+- views/wiki.haml
+- views/wikis.haml
 has_rdoc: true
-homepage: http://rblosxom.heroku.com/
+homepage: http://rblosxom.heroku.com
 licenses: []
 
 post_install_message: 
@@ -100,31 +122,34 @@ rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
-- rblosxom 0.1.2
+- Rblosxom
 - --main
-- README.rdoc
-- --webcvs
-- http://bitbucket.org/itsucks/rblosxom
+- README.mkd
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-requirements: 
-- Ruby, version 1.8.0 (or newer)
-rubyforge_project: 
-rubygems_version: 1.3.5
+      segments: 
+      - 1
+      - 2
+      version: "1.2"
+requirements: []
+
+rubyforge_project: rblosxom
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rblosxom is a Blosxom program written in ruby.
+summary: Ruby based blosxom.
 test_files: []
 

data/public/sass/_debug.sass

@@ -1,9 +0,0 @@
-!col_12 = "12_col.gif"
-!col_16 = "16_col.gif"
-
-/* selector= container
-=showgrid(!debug_selector = "#wrap", !grid_pic = "12_col.gif")
-  #{!debug_selector}
-    :background
-      :image= image_url(!grid_pic)
-      :repeat repeat-y

data/public/sass/_grid.sass

@@ -1,16 +0,0 @@
-/* add 960 pull, push classes
-=grid-push(!n, !cols = !ninesixty_columns)
-  :left= (!ninesixty_grid_width / !cols) * !n
-
-=grid-pushs(!cols = !ninesixty_columns)
-  @for !n from 1 through !cols - 1
-    .push_#{!n}
-      +grid-push(!n, !cols)
-
-=grid-pull(!n, !cols = !ninesixty_columns)
-  :left= -(!ninesixty_grid_width / !cols) * !n
-
-=grid-pulls(!cols = !ninesixty_columns)
-  @for !n from 1 through !cols - 1
-    .pull_#{!n}
-      +grid-pull(!n, !cols)

data/public/sass/_sticky_footer.sass

@@ -1,30 +0,0 @@
-=sticky-footer(!footer_height = "3em", !root_selector = "#wrap", !content_selector = "#main", !footer_selector = "#footer") 
-  *
-    :margin 0
-    :padding 0
-  html, body, #{!root_selector}
-    :height 100%
-  body > #{!root_selector}
-    :height auto
-    :min-height 100%
-  #{!content_selector}
-    :padding-bottom #{!footer_height}  /* must be same height as the footer */
-  #{!footer_selector}
-    :position relative
-    :margin-top -#{!footer_height}  /* negative value of footer height */
-    :height #{!footer_height}
-    :clear both
-  .clearfix
-    :display inline-block
-  .clearfix:after
-    :content "."
-    :display block
-    :height 0
-    :clear both
-    :visibility hidden
-  /* Hides from IE-mac \*/
-  * html .clearfix
-    :height 1%
-  .clearfix
-    :display block
-  /* End hide from IE-mac */