rblosxom 0.1.3 → 0.1.4

data/ChangeLog

@@ -1,3 +1,6 @@
+2011-01-03  Percy Lau  <percy.lau@gmail.com> 0.1.4
+    * see hg log -r 33:26
+
 2011-01-01  Percy Lau  <percy.lau@gmail.com> 0.1.3
     * Added wiki_render, Up to ruby1.9
 

data/Manifest

@@ -8,6 +8,8 @@ Rakefile
 VERSION
 bin/rblosxom-demo
 config/rackup.ru
+config/main.yml
+config/wiki.yml
 demo/grid.rb
 demo/main.rb
 demo/wiki_render.rb

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/config/main.yml

@@ -0,0 +1,14 @@
+title: Rblosxom
+slogan: a blosxom program.
+keywords: ruby, blosxom.
+description: Rblosxom is a blosxom program.
+language: en
+datadir: ./data/main
+url: http://rblosxom.heroku.com/
+depth: 0
+num_entries: 40
+file_extension: mkd
+default_flavour: html
+show_future_entries: 0
+theme: default
+copyright: Rblosxom

data/config/rackup.ru

@@ -15,6 +15,7 @@ $LOAD_PATH.unshift File.expand_path("../demo", File.dirname(__FILE__))
 
 require 'main'
 Rblosxom::Main.log_level = Logger::DEBUG
+Rblosxom::Main.config_file = File.expand_path("main.yml", File.dirname(__FILE__))
 map "/" do
     run Rblosxom::Main
 end
@@ -25,6 +26,8 @@ map '/grid' do
 end
 
 require 'wiki_render'
+Rblosxom::Wiki.root = File.expand_path("..", File.dirname(__FILE__))
+Rblosxom::Wiki.config_file = File.expand_path("wiki.yml", File.dirname(__FILE__))
 map '/wiki' do
     run Rblosxom::Wiki
 end

data/config/wiki.yml

@@ -0,0 +1,14 @@
+title: Rblosxom Wiki
+slogan: a blosxom program.
+keywords: ruby, blosxom.
+description: Rblosxom is a blosxom program.
+language: en
+datadir: ./data/wiki
+url: http://rblosxom.heroku.com/
+depth: 0
+num_entries: 40
+file_extension: mkd
+default_flavour: html
+show_future_entries: 0
+theme: default
+copyright: Rblosxom

data/demo/main.rb

@@ -6,7 +6,11 @@ module Rblosxom
             set_common_variables
             @log.info "Main start"
             @log.debug "Main debug"
-            content = File.read(File.expand_path("../README.mkd", File.dirname(__FILE__)))
+            index_file = File.expand_path("#{@root}/#{@config["datadir"]}/main.mkd")
+            unless File.exist?(index_file)
+                index_file = File.expand_path("#{@root}/README.mkd")
+            end
+            content = File.read(index_file)
             haml :index, :layout => true, :locals => { :content => content }
         end
     end

data/demo/wiki_render.rb

@@ -17,7 +17,9 @@ module Rblosxom
             end
 
             def pages
-                (Dir["**/*.mkd"] + Dir["**/*.markdown"] + Dir["**/*.textile"]).sort
+                Dir.chdir(File.expand_path("#{@root}/#{@config["datadir"]}")) {
+                    (Dir["**/*.mkd"] + Dir["**/*.markdown"] + Dir["**/*.textile"]).sort
+                }
             end
         end
     end
@@ -41,7 +43,8 @@ module Rblosxom
             @log.info "Wiki Render #{request.env["PATH_INFO"]}"
             @log.info "Wiki Render #{params[:captures]}"
 
-            request_file = request.env["PATH_INFO"][1..-1]
+            request_file = File.expand_path("#{@root}/#{@config["datadir"]}/#{request.env["PATH_INFO"][1..-1]}")
+            @log.debug "Wiki Render request file: #{request_file}"
             begin
                 content = File.open(request_file) do |file|
                     ext = request_file.split(".")[-1];
@@ -53,7 +56,7 @@ module Rblosxom
                         else
                           file.read
                     end
-               end
+                end
                 haml :wiki, :layout => true, :locals => { :content => content }
             rescue
                 #raise Sinatra::NotFound

data/lib/rblosxom/base.rb

@@ -16,6 +16,7 @@ module Rblosxom
         def set_common_variables
             require 'fileutils'
             require 'logger'
+            @root = options.root
             @config = options.config
             @log = Proc.new {
                 if options.log_file
@@ -71,7 +72,7 @@ module Rblosxom
             keywords: ruby, blosxom.
             description: Rblosxom is a blosxom program.
             language: en
-            datadir: /data
+            datadir: ./data
             url: http://rblosxom.heroku.com/
             depth: 0
             num_entries: 40

data/rblosxom.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rblosxom}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Percy Lau"]
-  s.date = %q{2011-01-01}
+  s.date = %q{2011-01-03}
   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 = ["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.files = ["AUTHORS", "ChangeLog", "INSTALL", "MIT-LICENSE", "Manifest", "README.mkd", "Rakefile", "VERSION", "bin/rblosxom-demo", "config/rackup.ru", "config/main.yml", "config/wiki.yml", "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"]

data/views/wikis.haml

@@ -5,7 +5,7 @@
       %ul
         - pages.each do |page|
           %li
-            %a{:href => "wiki/#{page}"}= page
+            %a{:href => "#{request.env["SCRIPT_NAME"]}/#{page}"}= page
 
 #footer
   .inner= haml :footer, :layout => false, :locals => { }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Percy Lau
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 +08:00
+date: 2011-01-03 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,8 @@ files:
 - VERSION
 - bin/rblosxom-demo
 - config/rackup.ru
+- config/main.yml
+- config/wiki.yml
 - demo/grid.rb
 - demo/main.rb
 - demo/wiki_render.rb