rblosxom 0.1.1 → 0.1.2

data/ChangeLog

@@ -1,6 +1,8 @@
+2010-01-19  Percy Lau  <percy.lau@gmail.com> 0.1.2
+    * Added logger handler, category_list and archive_list helper
+
 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

@@ -1,5 +1,3 @@
-README
-======
 [rblosxom][rblosxom]是一个[blosxom][blosxom]程序，
 它使用了下面的框架和工具:
 
@@ -8,7 +6,7 @@ README
 - [rdiscount][rdiscount]
 - [compass-960][compass_960]
 
-目前这个版本也是第一个版本0.1.1，功能还不多。
+目前版本0.1.2
 
 Author
 ------
@@ -22,10 +20,6 @@ Install
 -------
 Please see the [INSTALL][install].
 
-More Information
-----------------
-Please see the [wiki][wiki].
-
 License
 -------
 Released under [MIT License][license].
@@ -37,7 +31,6 @@ Released under [MIT License][license].
 [rdiscount]: http://github.com/rtomayko/rdiscount/
 [compass_960]: http://github.com/chriseppstein/compass-960-plugin/
 [rblosxom]: http://bitbucket.org/itsucks/rblosxom/
-[wiki]: http://bitbucket.org/itsucks/rblosxom/wiki/
 [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

data/demo/grid.rb

@@ -4,6 +4,7 @@ module Rblosxom
     class Grid < Base
         get '/?' do
             set_common_variables
+            @log.info "Grid start"
             haml :grid, :layout => false, :locals => { }
         end
     end

data/demo/main.rb

@@ -4,6 +4,7 @@ module Rblosxom
     class Main < Base
         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 }
         end

data/lib/rblosxom/base.rb

@@ -14,11 +14,51 @@ module Rblosxom
 
     module Helpers
         def set_common_variables
+            require 'ftools'
+            require 'logger'
             @config = options.config
+            @log = Proc.new {
+                if options.log_file
+                    begin
+                        unless File.exist?(options.log_file)
+                            File.makedirs(File.dirname(options.log_file))
+                            File.new(options.log_file, "w")
+                        end
+                        log = File.writable?(options.log_file) ? Logger.new(options.log_file) : Logger.new(STDOUT)
+                    rescue
+                        log = Logger.new(STDOUT)
+                    end
+                else
+                    log = Logger.new(STDOUT)
+                end
+                log.progname = "#{::Rblosxom.name}"
+                log.level = Logger::INFO
+                log.datetime_format = "%Y-%m-%d %H:%M:%S %Z "
+                log
+            }.call
 
             require 'date'
             @footer = { :year => %/#{DateTime.now.year}/, :copyright => %/#{options.config["copyright"]}/, :generator => %/rblosxom #{::Rblosxom::Version::STRING}/ }
         end
+
+        # all category list
+        def category_list
+            list = []
+            Dir["#{options.config["datadir"]}/**/*"].each do |path|
+                list.push([path, Dir["#{path}/*.#{options.config["file_extension"]}"].length]) if File.directory? path
+            end 
+            list
+        end
+        
+        # this year archive list
+        def archive_list
+            list = []
+            now = DateTime.now
+            this_year = now.year
+            this_month = now.month
+            1.upto(now.month) { |m| list.push(DateTime.new(this_year, m)) }
+            list
+        end
     end
 
     class Base < Sinatra::Base
@@ -27,24 +67,25 @@ module Rblosxom
         unless defined? CONFIG
             CONFIG = YAML.load(<<-END)
             title: Rblosxom
-            slogan: My Slogan.
-            description: Ruby based blosxom.
+            slogan: a blosxom program.
+            keywords: ruby, blosxom.
+            description: Rblosxom is a blosxom program.
             language: en
             datadir: /data
-            url: http://bitbucket.org/itsucks/rblosxom/
+            url: http://rblosxom.heroku.com/
             depth: 0
             num_entries: 40
             file_extension: mkd
             default_flavour: html
             show_future_entries: 0
             theme: default
-            logger_level: info
             copyright: Rblosxom
             END
         end
 
         class << self
             attr_accessor :config_file
+            attr_accessor :log_file
             attr_reader :config
         end
         set :config, Proc.new { config_file ? YAML::load(File.read(config_file)) : CONFIG }

data/public/sass/screen.sass

@@ -68,13 +68,13 @@ body
         :text-decoration none
         :color #999
         :font-weight bold
-        &:after
-          :text-decoration none
-          :color #333
         &.active
           :text-decoration none
           :color #F90
           :font-weight bold
+        &:hover
+          :text-decoration none
+          :color #333
 
 #main
   p
@@ -90,14 +90,18 @@ body
     :color #F90
     :border-bottom 1px solid #E5E5E5
   .content
-    +grid(8,12)
+    +grid(9,12)
     img
       :border 1px solid #CDCDCD
       :float left
       :margin 0px 15px 5px
       :padding 5px
   .sidebar
-    +grid(4,12)
+    +grid(3,12)
+    p.title
+      :margin 0px 20px
+      :font-weight bold
+      :font-style oblique
 
 #footer
   .inner

data/public/stylesheets/grid.css

@@ -205,6 +205,6 @@ body > #wrap { height: auto; min-height: 100%; }
 .clearfix { display: block; }
 
 /* End hide from IE-mac */
-.g12 { background-image: url('/images/12_col.gif?1261042258'); background-repeat: repeat-y; }
+.g12 { background-image: url('/images/12_col.gif?1261547183'); background-repeat: repeat-y; }
 
-.g16 { background-image: url('/images/16_col.gif?1261042258'); background-repeat: repeat-y; }
+.g16 { background-image: url('/images/16_col.gif?1261547183'); background-repeat: repeat-y; }

data/public/stylesheets/screen.css

@@ -101,15 +101,16 @@ body { background-color: white; color: #666666; }
 #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:after { text-decoration: none; color: #333; }
 #header ul li a.active { text-decoration: none; color: #F90; font-weight: bold; }
+#header ul li a:hover { text-decoration: none; color: #333; }
 
 #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 .content { display: inline; float: left; margin-left: 10px; margin-right: 10px; width: 620px; }
+#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: 300px; }
+#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; }

data/rblosxom.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'rblosxom'
-  s.version = '0.1.1'
-  s.date = '2009-12-23'
+  s.version = '0.1.2'
+  s.date = '2010-01-19'
 
   s.description = "Ruby based Blosxom."
   s.summary     = "rblosxom is a Blosxom program written in ruby."

data/views/footer.haml

@@ -1,4 +1,4 @@
 %p
   = %/©#{@footer[:year]}/
-  %a{:title=>"rbloxom home", :href=>"#{@config['url']}"}
+  %a{:title=>"home", :href=>"#{@config['url']}"}
     %strong= @footer[:copyright]

data/views/grid.haml

@@ -3,15 +3,15 @@
   %head
     %title
       = @config["title"]
-      compass-960 grid
+      960 grid
     %meta{ "http-equiv" => "Content-Type", "content" => "application/xhtml+xml; charset=utf-8" }
     %meta{ "http-equiv" => "Content-Language", "content" => "zh-cn" }
-
     %meta{ "name" => "Language", "content" => "chinese" }
-    %meta{ "name" => "robots", "content" => "index, follow, all" }
     %meta{ "name" => "generator", "content" => "#{@footer[:generator]}" }
     %meta{ :name => "robots", :content => "index, follow, noarchive" }
     %meta{ :name => "googlebot", :content => "noarchive" }
+    %meta{ "name" => "description", "content" => "960 grid demo" }
+    %meta{ "name" => "keywords", "content" => "compass 960gs" }
 
     %link{ :rel => "stylesheet", :href => "/stylesheets/grid.css", :media => "screen", :type => "text/css" }
 

data/views/header.haml

@@ -1,9 +1,10 @@
 %h1
   = @config["title"] 
-  = ::Rblosxom::Version::STRING
+  %span
+    = @config["slogan"]
 %ul
   %li
-    %a{:class=>"active", :title=>"rblosxom", :href=>"/"} rblosxom
+    %a{:class=>"active", :title=>"home", :href=>"/"} rblosxom
   %li
     |
   %li

data/views/layout.haml

@@ -4,12 +4,12 @@
     %title= @config["title"]
     %meta{ "http-equiv" => "Content-Type", "content" => "application/xhtml+xml; charset=utf-8" }
     %meta{ "http-equiv" => "Content-Language", "content" => "zh-cn" }
-
     %meta{ "name" => "Language", "content" => "chinese" }
-    %meta{ "name" => "robots", "content" => "index, follow, all" }
-    %meta{ "name" => "generator", "content" => "#{@config["generator"]}" }
+    %meta{ "name" => "generator", "content" => "#{@footer[:generator]}" }
     %meta{ :name => "robots", :content => "index, follow, noarchive" }
     %meta{ :name => "googlebot", :content => "noarchive" }
+    %meta{ "name" => "description", "content" => @config["description"] }
+    %meta{ "name" => "keywords", "content" => @config["keywords"] }
 
     %link{ :rel => "stylesheet", :href => "/stylesheets/screen.css", :media => "screen", :type => "text/css" }
 

metadata

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