rblosxom 0.1.0 → 0.1.1

data/ChangeLog

@@ -1,3 +1,6 @@
+2009-12-23  Percy Lau  <percy.lau@gmail.com> 0.1.1
+    * Added Rblosxom options root, config_file, config
+
 2009-12-20  Percy Lau  <percy.lau@gmail.com> 0.1.0
 
     * rblosxom init

data/README.rdoc

@@ -8,7 +8,7 @@ README
 - [rdiscount][rdiscount]
 - [compass-960][compass_960]
 
-目前这个版本也是第一个版本0.1.0，功能还不多。
+目前这个版本也是第一个版本0.1.1，功能还不多。
 
 Author
 ------

data/config/rackup.ru

@@ -1,13 +1,18 @@
 require 'sinatra'
-require 'rblosxom'
+begin
+    require 'rblosxom'
+rescue LoadError => e
+    require 'lib/rblosxom'
+end
 
 disable :run
-set :root, File.expand_path("../", File.dirname(__FILE__))
+set :environment, :development
 
 $LOAD_PATH.unshift File.expand_path("../demo", File.dirname(__FILE__))
-require 'rapp'
+
+require 'main'
 map "/" do
-    run Rblosxom::Rblosxom
+    run Rblosxom::Main
 end
 
 require 'grid'

data/demo/grid.rb

@@ -1,10 +1,7 @@
 require 'rblosxom/base'
 
 module Rblosxom
-    class Grid < App
-        set :public, File.join(root, "public")
-        set :views, File.join(root, "views")
-
+    class Grid < Base
         get '/?' do
             set_common_variables
             haml :grid, :layout => false, :locals => { }

data/demo/{rapp.rb → main.rb}

@@ -1,11 +1,7 @@
 require 'rblosxom/base'
-require 'rdiscount'
 
 module Rblosxom
-    class Rblosxom < App
-        set :public, File.join(root, "public")
-        set :views, File.join(root, "views")
-
+    class Main < Base
         get '/?' do
             set_common_variables
             content = File.read(File.expand_path("../README.rdoc", File.dirname(__FILE__)))
@@ -15,4 +11,4 @@ module Rblosxom
 end
 
 # vim: ft=ruby:fenc=utf-8:sw=4:ts=4:sts=4:et:
-# rapp.rb end here
+# main.rb end here

data/lib/rblosxom/base.rb

@@ -21,7 +21,9 @@ module Rblosxom
         end
     end
 
-    class App < Sinatra::Application
+    class Base < Sinatra::Base
+        include Helpers
+
         unless defined? CONFIG
             CONFIG = YAML.load(<<-END)
             title: Rblosxom
@@ -41,9 +43,15 @@ module Rblosxom
             END
         end
 
-        set :config, Proc.new { (defined? config_file) ? YAML::load(File.read(config_file)) : CONFIG }
-        set :public, Proc.new { root && File.join(root, "themes", config["theme"], "public") }
-        include Helpers
+        class << self
+            attr_accessor :config_file
+            attr_reader :config
+        end
+        set :config, Proc.new { config_file ? YAML::load(File.read(config_file)) : CONFIG }
+
+        set :root, File.expand_path("../../", File.dirname(__FILE__))
+        set :static, true
+        enable :sessions
     end
 end
 

data/rblosxom.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'rblosxom'
-  s.version = '0.1.0'
-  s.date = '2009-12-18'
+  s.version = '0.1.1'
+  s.date = '2009-12-23'
 
   s.description = "Ruby based Blosxom."
   s.summary     = "rblosxom is a Blosxom program written in ruby."
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'compass-960-plugin', '>= 0.9.11',   '< 1.0'
 
   s.has_rdoc = true
-  s.homepage = "http://bitbucket.org/itsucks/#{s.name}"
+  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}"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rblosxom
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Percy Lau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +08:00
+date: 2009-12-23 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,25 +74,25 @@ files:
 - MIT-LICENSE
 - AUTHORS
 - config/rackup.ru
+- demo/main.rb
 - demo/grid.rb
-- demo/rapp.rb
-- public/images/12_col.gif
 - public/images/16_col.gif
+- public/images/12_col.gif
+- public/sass/_debug.sass
 - 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
-- views/grid.haml
+- public/stylesheets/screen.css
 - views/layout.haml
-- views/index.haml
 - views/footer.haml
+- views/index.haml
+- views/header.haml
+- views/grid.haml
 - rblosxom.gemspec
 has_rdoc: true
-homepage: http://bitbucket.org/itsucks/rblosxom
+homepage: http://rblosxom.heroku.com/
 licenses: []
 
 post_install_message: 
@@ -100,7 +100,7 @@ rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
-- rblosxom 0.1.0
+- rblosxom 0.1.1
 - --main
 - README.rdoc
 - --webcvs