rblosxom 0.1.5 → 0.1.6

data/ChangeLog

@@ -1,3 +1,12 @@
+2011-02-12 14:06:21 +0800  Percy Lau <percy.lau@gmail.com> 0.1.6
+    * move src to gitorious
+
+2011-01-28 13:22:35 +0800  Percy Lau <percy.lau@gmail.com>
+    * fix haml texile filter list render error.
+
+2011-01-27 12:19:55 +0800  Percy Lau <percy.lau@gmail.com>
+    * fix ctrl-c no longer stops webrick cleanly.
+
 2011-01-08 00:30:50 +0800  Percy Lau <percy.lau@gmail.com> 0.1.5
     * remove markdown support, only support textile page
 

data/INSTALL

@@ -1,26 +1,40 @@
-== INSTALL
+h3. INSTALL
 
 安装 rblosxom gem:
+<pre>
 $ gem install rblosxom --source http://gemcutter.org
+</pre>
 
 运行 demo:
+<pre>
 $ rblosxom-demo
+</pre>
 
 通过浏览器访问 http://127.0.0.1:7878/
 
-== HACKING
+h3. HACKING
 
-下载 source
-$ hg clone https://pernn@bitbucket.org/pernn/rblosxom
+clone source
+<pre>
+$ hg clone https://liupeng@bitbucket.org/liupeng/rblosxom
+</pre>
 
-安装 rack, sinatra, haml, RedCloth, itsucks-compass-960-plugin
-$ gem install sinatra, haml, RedCloth, itsucks-compass-960-plugin
+调试运行, 需要安装 sinatra haml RedCloth
+<pre>
+$ for g in sinatra haml RedCloth ;do gem install $g;done
+$ rackup config/rackup.ru
+</pre>
 
-定制 theme:
+定制 theme(css), 需要安装 itsucks-compass-960-plugin:
+<pre>
+$ gem install itsucks-compass-960-plugin
 $ compass -r ninesixty -f 960 --sass-dir=sass --css-dir=stylesheets --javascript-dir=javascripts --images-dir=images public
-
-更新 css:
+...
 $ compass -u public
+</pre>
 
-运行:
-$ rackup config/rackup.ru
+制作 gem, 需要安装 echoe:
+<pre>
+$ gem install echoe
+$ rake gem
+</pre>

data/README.textile

@@ -23,11 +23,11 @@ Released under "MIT License":license.
 
 
 [blosxom]http://blosxom.sourceforge.net/
-[rblosxom]http://bitbucket.org/pernn/rblosxom/
+[rblosxom]http://bitbucket.org/liupeng/rblosxom/
 [sinatra]http://www.sinatrarb.com/
 [haml]http://haml.hamptoncatlin.com/
 [compass_960]http://github.com/chriseppstein/compass-960-plugin/
 [RedCloth]http://redcloth.org/
-[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
+[license]http://bitbucket.org/liupeng/rblosxom/src/tip/MIT-LICENSE
+[install]http://bitbucket.org/liupeng/rblosxom/src/tip/INSTALL
+[changelog]http://bitbucket.org/liupeng/rblosxom/src/tip/ChangeLog

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/rblosxom-demo

@@ -1,28 +1,56 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*- vim: encoding=utf-8:sw=4:ts=4:sts=4:et:
+$KCODE = 'u'
+
 require 'rubygems'
-require 'rack'
+require 'rack/server'
 require 'rblosxom'
-
-options = {:Port => 7878, :Host => "0.0.0.0", :AccessLog => []}
+require 'optparse'
 
 install_dir = File.join(Gem.dir, "gems", "rblosxom-#{Rblosxom::Version::STRING}")
 rackup_file = File.join(install_dir, "config/rackup.ru")
 inner_app = eval "Rack::Builder.new {( " +  File.read(rackup_file) + "\n )}.to_app", nil, rackup_file
-
-begin
-    server = Rack::Handler::Mongrel
-rescue LoadError => e
-    server = Rack::Handler::WEBrick
-end
-
+server = Rack::Handler.default
 app = Rack::Builder.new {
-    use Rack::CommonLogger, $stderr  unless server.name =~ /CGI/
+    use Rack::CommonLogger, $stderr unless server.name =~ /CGI/
     use Rack::ShowExceptions
     use Rack::Lint
     run inner_app
 }.to_app
 
-server.run app, options
+options = {:Port => 7878}
+opt = OptionParser.new("#{File.basename($0)}")
+opt.on('-p', '--port PORT', 'use PORT (1024-65536, default: 7878)') {|v| options[:Port] = v }
+opt.parse!(ARGV)
+
+
+class PatchedRackServer < Rack::Server
+    def initialize(options = nil)
+        @options = options
+        @app = options[:app] if options && options[:app]
+    end
+end
+
+$stdout.puts <<EOF
+----------------------------------------
+Start up rblosxom !
+URL : http://localhost:#{options[:Port]}
+----------------------------------------
+EOF
+
+if Rack.release >= "1.2"
+    # The code that traps Ctrl-C moved from Rack::Handler to Rack::Server in
+    # Rack 1.2.1, and consequently, so did the syntax to start a server.
+    # See: https://github.com/rack/rack/issues/issue/35
+    # 
+    # Additionally, there is currently a bug in Rack::Server which prevents
+    # us from using :app properly. In order to get around this, we subclass
+    # Rack::Server, and then apply the patch there.
+    # See: https://github.com/rack/rack/commit/c73b474525bace3f059a130b15413abd4d917086
+    PatchedRackServer.start(:app => app, :Port => options[:Port])
+    #Rack::Server.start(:app => app, :Port => 7878)
+else
+    server.run app, options
+end
 
-# vim: ft=ruby:fenc=utf-8:sw=4:ts=4:sts=4:et:
 # rblosxom-demo.rb end here

data/config/rackup.ru

@@ -1,4 +1,5 @@
 require 'sinatra'
+require 'redcloth'
 require 'logger'
 begin
     require 'rblosxom'

data/demo/wiki_render.rb

@@ -1,4 +1,8 @@
+# -*- coding: utf-8 -*- vim: encoding=utf-8:sw=4:ts=4:sts=4:et:
+$KCODE = 'u'
+
 require 'rblosxom/base'
+require 'uri'
 
 module Rblosxom
     class Base < Sinatra::Base
@@ -35,7 +39,7 @@ module Rblosxom
             haml :wikis, :layout => true
         end
 
-        page_regex = '(?:/[.\w]+)+'
+        page_regex = '(?:/.+)+'
         page_url = %r@^(#{page_regex})\b$@
         get page_url do
             set_common_variables
@@ -45,7 +49,7 @@ module Rblosxom
             request_file = File.expand_path("#{@root}/#{@config["datadir"]}/#{request.env["PATH_INFO"][1..-1]}")
             @log.debug "Wiki Render request file: #{request_file}"
             begin
-                haml :wiki, :layout => true, :locals => { :content => File.read(request_file) }
+                haml :wiki, :layout => true, :locals => { :content => File.read(URI.decode(request_file)) }
             rescue
                 #raise Sinatra::NotFound
                 halt 404, 'page not found!'
@@ -54,5 +58,4 @@ module Rblosxom
     end
 end
 
-# vim: ft=ruby:fenc=utf-8:sw=4:ts=4:sts=4:et:
 # wiki_render.rb end here

data/rblosxom.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rblosxom}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   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-09}
+  s.date = %q{2011-02-12}
   s.default_executable = %q{rblosxom-demo}
   s.description = %q{Rblosxom is a blosxom program written in ruby.}
   s.email = %q{percy.lau@gmail.com}

data/views/index.haml

@@ -1,9 +1,7 @@
 #wrap
   #header= haml :header, :layout => false
   #main.clearfix
-    .g12
-      :textile
-        #{content}
+    .g12= textile("#{content}")
 
 #footer
   .inner= haml :footer, :layout => false, :locals => { }

data/views/wiki.haml

@@ -1,9 +1,7 @@
 #wrap
   #header= haml :header, :layout => false
   #main.clearfix
-    .g12
-      :textile
-        #{content}
+    .g12= textile("#{content}")
 
 #footer
   .inner= haml :footer, :layout => false, :locals => { }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Percy Lau
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +08:00
+date: 2011-02-12 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency