hobix 0.4 → 0.6

data/lib/hobix/weblog.rb

@@ -4,7 +4,7 @@
 # Hobix command-line weblog system.
 #
 # Copyright (c) 2003-2004 why the lucky stiff
-# Copyright (c) 2005 MenTaLguY
+# Copyright (c) 2005-2007 MenTaLguY
 #
 # Written & maintained by why the lucky stiff <why@ruby-lang.org>
 # Additional bits by MenTaLguY <mental@rydia.net>
@@ -92,9 +92,10 @@ end
 #   <% if page.next %>"next":<%= page.next_link %><% end %>
 #
 class Page
+    attr_reader :id
     attr_accessor :link, :next, :prev, :timestamp, :updated
-    def initialize( id )
-        @id = id
+    def initialize( id, dir='.' )
+        @id, @dir = id, dir
     end
     def id; dirj( @dir, @id ).gsub( /^\/+/, '' ); end
     def link; dirj( @dir, @id ) + @ext; end
@@ -106,8 +107,8 @@ class Page
         end
         link
     end
-    def add_path( dir, ext ) #:nodoc:
-        @dir, @ext = dir, ext
+    def add_ext( ext ) #:nodoc:
+        @ext = ext
     end
     def reference_fields; [:next, :prev]; end
     def references; reference_fields.map { |f| self.send f }.compact; end
@@ -145,6 +146,9 @@ end
 # output_path::    Path to output directory.
 # lib_path::       Path to extension library directory.
 #
+# git::            If true, regenerations will commit to git and push the
+#                  site to the blahg remote.
+#
 # == Regeneration
 #
 # One of the primary uses of the Weblog class is to coordinate
@@ -166,12 +170,12 @@ end
 #
 # To give you a general idea, skel_index looks something like this:
 #
-#   def skel_index( path_storage )
+#   def skel_index( path_storage, section_path )
 #       index_entries = path_storage.lastn( @lastn )
-#       page = Page.new( 'index' )
+#       page = Page.new( 'index', section_path )
 #       page.prev = index_entries.last.created.strftime( "%Y/%m/index" )
 #       page.timestamp = index_entries.first.created
-#       page.updated = path_storage.last_modified( index_entries )
+#       page.updated = path_storage.last_updated( index_entries )
 #       yield :page => page, :entries => index_entries
 #   end
 #
@@ -215,14 +219,14 @@ end
 #
 #   module Hobix
 #   class Weblog
-#       def skel_sidebar( path_storage )
+#       def skel_sidebar( path_storage, section_path )
 #           ## Load `about' and `learn' entries
 #           abouts = path_storage.find( :all => true, :inpath => 'about' ).reverse
 #           learns = path_storage.find( :all => true, :inpath => 'learn' ).reverse
 #   
 #           ## Create page data
-#           page = Page.new( 'sidebar' )
-#           page.updated = path_storage.last_modified( abouts + learns )
+#           page = Page.new( 'sidebar', section_path )
+#           page.updated = path_storage.last_updated( abouts + learns )
 #           yield :page => page, 
 #                 :about_entries => abouts, :learn_entries => learns
 #       end
@@ -244,7 +248,7 @@ end
 #
 # We create a Page object, which dictates that the output will be saved to
 # /sidebar.ext.  A modification time is discovered by passing a combined list
-# to +Hobix::BaseStorage#last_modified+.  The +updated+ property is being
+# to +Hobix::BaseStorage#last_updated+.  The +updated+ property is being
 # set to the latest timestamp among the about and learn entries.
 #
 # PLEASE NOTE: The +updated+ property is very important.  The regeneration
@@ -306,6 +310,8 @@ class Weblog
 
     _! 'Libraries and Plugins'
     _ :requires,           :req => true, :edit_as => :omap
+
+    _ :git,                :edit_as => :text
     
     attr_accessor :path
     attr_reader   :hobix_yaml
@@ -360,7 +366,9 @@ class Weblog
         tag = @entry_class =~ /^[\w:]+$/ ? @entry_class.untaint : default_entry_class unless tag
             
         found_class = nil
+        raise @@entry_classes.inspect
         if @@entry_classes
+
             found_class = @@entry_classes.find do |c|
                 tag == c.name.split( '::' ).last.downcase
             end
@@ -396,7 +404,7 @@ class Weblog
     # Translate paths relative to the weblahhg's URL.  This is especially important
     # if a weblog isn't at the root directory for a domain.
     def expand_path( path )
-        File.expand_path( path.gsub( /^\/+/, '' ), self.link.path.gsub( /\/*$/, '/' ) )
+        File.expand_path( path.gsub( /^\/+/, '' ), self.link.path.gsub( /\/*$/, '/' ) ).gsub( /^C:/, '')
     end
 
     # Load the weblog information from a YAML file and +start+ the Weblog.
@@ -427,8 +435,9 @@ class Weblog
         loop do
             try_page = paths.join( '_' ).gsub('-','_')
             if respond_to? "skel_#{ try_page }"
-                path_storage = storage.path_storage( File.dirname( page_name ) )
-                method( "skel_#{ try_page }" ).call( path_storage ) do |vars|
+                section_path = File.dirname( page_name )
+                path_storage = storage.path_storage( section_path )
+                method( "skel_#{ try_page }" ).call( path_storage, section_path ) do |vars|
                     vars[:weblog] = self
                     raise TypeError, "No `page' variable returned from skel_#{ try_page }." unless vars[:page]
                     yield vars
@@ -509,7 +518,7 @@ class Weblog
                     ## Build the output pages
                     build_pages( page_name ) do |vars|
                         ## Extension and Path
-                        vars[:page].add_path( File.dirname( tpl_path ), tpl_ext )
+                        vars[:page].add_ext( tpl_ext )
                         vars[:template] = path
                         vars[:output] = output
                         eid = ( vars[:entry] && vars[:entry].id ) || page_name
@@ -617,10 +626,14 @@ class Weblog
                 txt = output.load( template, vars )
                 ## A plugin perhaps needs to change the output page name
                 full_out_path = File.join( output_path, vars[:page].link.split( '/' ) )
-                File.makedirs( File.dirname( full_out_path ) )
-                File.open( full_out_path, 'w' ) do |f| 
-                    f << txt
-                    f.chmod 0664 rescue nil
+                saved_umask = File.umask( 0002 ) rescue nil
+                begin
+                  File.makedirs( File.dirname( full_out_path ) )
+                  File.open( full_out_path, 'w' ) do |f| 
+                      f << txt
+                  end
+                ensure
+                  File.umask( saved_umask ) rescue nil
                 end
                 published[vars[:page].link] = vars[:page]
                 published_types << page_name
@@ -636,18 +649,30 @@ class Weblog
                 p.publish( published )
             end
         end
+
+        commit_to_git if @git
+
         reset_output_map
     end
 
+    # Method to commit to the local git repo and push pure happiness to the
+    # remote server named blahg (which should be of webserving character and
+    # a pleasant demeanor).
+    def commit_to_git
+      puts `git add .`
+      puts `git commit -a -m "New poshts for the syhtt"`
+      puts `git push blahg master`
+    end
+
     # Handler for templates with `index' prefix.  These templates will
     # receive entries loaded by +Hobix::BaseStorage#lastn+.  Only one
     # index page is requested by this handler.
-    def skel_index( path_storage )
+    def skel_index( path_storage, section_path )
         index_entries = path_storage.lastn( @lastn )
-        page = Page.new( 'index' )
+        page = Page.new( 'index', section_path )
         page.prev = index_entries.last.created.strftime( "%Y/%m/index" )
         page.timestamp = index_entries.first.created
-        page.updated = path_storage.last_modified( index_entries )
+        page.updated = path_storage.last_updated( index_entries )
         yield :page => page, :entries => index_entries
     end
 
@@ -655,7 +680,7 @@ class Weblog
     # receive a list of entries for each day that has at least one entry
     # created in its time period.  This handler requests daily pages
     # to be output as `/%Y/%m/%d.ext'.
-    def skel_daily( path_storage )
+    def skel_daily( path_storage, section_path )
         entry_range = path_storage.find
         first_time, last_time = entry_range.last.created, entry_range.first.created
         start = Time.mktime( first_time.year, first_time.month, first_time.day, 0, 0, 0 ) + 1
@@ -669,11 +694,11 @@ class Weblog
         end
         days.extend Hobix::Enumerable
         days.each_with_neighbors do |prev, curr, nextd| 
-            page = Page.new( curr[0].strftime( "%Y/%m/%d" ) )
+            page = Page.new( curr[0].strftime( "%Y/%m/%d" ), section_path )
             page.prev = prev[0].strftime( "%Y/%m/%d" ) if prev
             page.next = nextd[0].strftime( "%Y/%m/%d" ) if nextd
             page.timestamp = curr[0]
-            page.updated = path_storage.last_modified( curr[1] )
+            page.updated = path_storage.last_updated( curr[1] )
             yield :page => page, :entries => curr[1]
         end
     end
@@ -682,16 +707,16 @@ class Weblog
     # receive a list of entries for each month that has at least one entry
     # created in its time period.  This handler requests monthly pages
     # to be output as `/%Y/%m/index.ext'.
-    def skel_monthly( path_storage )
+    def skel_monthly( path_storage, section_path )
         months = path_storage.get_months( path_storage.find )
         months.extend Hobix::Enumerable
         months.each_with_neighbors do |prev, curr, nextm| 
             entries = path_storage.within( curr[0], curr[1] )
-            page = Page.new( curr[0].strftime( "%Y/%m/index" ) )
+            page = Page.new( curr[0].strftime( "%Y/%m/index" ), section_path )
             page.prev = prev[0].strftime( "%Y/%m/index" ) if prev
             page.next = nextm[0].strftime( "%Y/%m/index" ) if nextm
             page.timestamp = curr[1]
-            page.updated = path_storage.last_modified( entries )
+            page.updated = path_storage.last_updated( entries )
             yield :page => page, :entries => entries
         end
     end
@@ -700,7 +725,7 @@ class Weblog
     # receive a list of entries for each month that has at least one entry
     # created in its time period.  This handler requests yearly pages
     # to be output as `/%Y/index.ext'.
-    def skel_yearly( path_storage )
+    def skel_yearly( path_storage, section_path )
         entry_range = path_storage.find
         first_time, last_time = entry_range.last.created, entry_range.first.created
         years = (first_time.year..last_time.year).collect do |y|
@@ -709,11 +734,11 @@ class Weblog
         years.extend Hobix::Enumerable
         years.each_with_neighbors do |prev, curr, nextm| 
             entries = path_storage.within( curr[0], curr[1] )
-            page = Page.new( curr[0].strftime( "%Y/index" ) )
+            page = Page.new( curr[0].strftime( "%Y/index" ), section_path )
             page.prev = prev[0].strftime( "%Y/index" ) if prev
             page.next = nextm[0].strftime( "%Y/index" ) if nextm
             page.timestamp = curr[1]
-            page.updated = path_storage.last_modified( entries )
+            page.updated = path_storage.last_updated( entries )
             yield :page => page, :entries => entries
         end
     end
@@ -721,17 +746,17 @@ class Weblog
     # Handler for templates with `entry' prefix.  These templates will
     # receive one entry for each entry in the weblog.  The handler requests
     # entry pages to be output as `/shortName.ext'.
-    def skel_entry( path_storage )
+    def skel_entry( path_storage, section_path )
         all_entries = [path_storage.find]
         all_entries += sections_ignored.collect { |ign| path_storage.find( :all => true, :inpath => ign ) }
         all_entries.each do |entry_set|
             entry_set.extend Hobix::Enumerable
             entry_set.each_with_neighbors do |nexte, entry, prev|
-                page = Page.new( entry.class.url_link( entry ) )
+                page = Page.new( entry.id )
                 page.prev = prev.id if prev
                 page.next = nexte.id if nexte
                 page.timestamp = entry.created
-                page.updated = path_storage.modified( entry.id )
+                page.updated = path_storage.updated( entry.id )
                 yield :page => page, :entry => entry
             end
         end
@@ -740,7 +765,7 @@ class Weblog
     # Handler for templates with `section' prefix.  These templates
     # will receive all entries below a given directory.  The handler
     # requests will be output as `/section/index.ext'.
-    def skel_section( path_storage )
+    def skel_section( path_storage, section_path )
         section_map = {}
         path_storage.all.each do |entry|
             dirs = entry.id.split( '/' )
@@ -752,7 +777,7 @@ class Weblog
         end
         section_map.each do |section, entries|
             page = Page.new( "/#{ section }/index" )
-            page.updated = path_storage.last_modified( entries )
+            page.updated = path_storage.last_updated( entries )
             yield :page => page, :entries => entries
         end
     end
@@ -792,18 +817,26 @@ class Weblog
     # Handler for templates with `tags' prefix.  These templates
     # will receive a tag with all entries tagged with it. The handler
     # requests will be output as `/tags/<tag>/index.ext'.
-    def skel_tags( path_storage ) 
+    def skel_tags( path_storage, section_path ) 
       # Get a list of all known tags
       tags = path_storage.find( :all => true ).map { |e| e.tags }.flatten.uniq
       
       tags.each do |tag|
         entries = path_storage.find.find_all { |e| e.tags.member? tag }
-        page = Page.new( File::join('tags',tag,'index' ) )
-        page.updated = path_storage.last_modified( entries ) 
+        page = Page.new( File::join( 'tags',tag,'index' ), section_path )
+        page.updated = path_storage.last_updated( entries ) 
         yield :page => page, :entries => entries
       end
     end
 
+    def join_path( prefix, suffix )
+        case prefix
+	when '', '.'
+            suffix
+	else
+            "#{ prefix }/#{ suffix }"
+	end
+    end
 
     class AuthorNotFound < Exception; end
 

data/lib/hobix.rb

@@ -15,6 +15,7 @@
 #++
 require 'hobix/config'
 require 'hobix/weblog'
+require 'rbconfig'
 
 # = Hobix
 #
@@ -204,14 +205,20 @@ require 'hobix/weblog'
 #     end    
 #   end
 #
+
 module Hobix
     ## Version used to compare installations
-    VERSION = '0.4'
+    VERSION = '0.5'
     ## CVS information
     CVS_ID = "$Id$"
     CVS_REV = "$Revision$"[11..-3]
     ## Share directory contains external data files
-    SHARE_PATH = "/usr/share/hobix/"
+    share_path = File.expand_path('../../share', __FILE__)
+    if File.exists? share_path
+        SHARE_PATH = share_path
+    else
+        SHARE_PATH = "#{ ::Config::CONFIG['datadir'] }/hobix/"
+    end 
 
     ## Get a top-level constant from a string
     def self.const_find( tclass )

data/share/default-blog/hobix.yaml

@@ -0,0 +1,16 @@
+--- !hobix.com,2004/weblog 
+title: a bokononist asks
+link: http://bokononist.hobix.com/
+tagline: "nice, nice, very nice"
+period: 00:60:00
+authors: {}
+linklist:  
+- hobix: http://hobix.com/
+- del.icio.us: http://del.icio.us/
+requires: 
+- hobix/storage/filesys
+- hobix/out/quick
+- hobix/out/erb
+- hobix/out/rss
+- hobix/out/okaynews
+- hobix/out/atom

data/share/default-blog/htdocs/site.css

@@ -0,0 +1,174 @@
+body {
+    font-family: georgia, serif;
+    margin: 20px 60px 60px 60px;
+    background: #F1F8FF;
+}
+
+A 			{ color: #003366; text-decoration: underline; }
+A:link		{ color: #003366; text-decoration: underline; }
+A:visited	{ color: #003366; text-decoration: underline; }
+A:active	{ color: #999999;  }
+A:hover		{ color: #999999;  }
+
+h1, h2, h3 {
+    margin: 0px;
+    padding: 0px;
+}
+
+#page {
+    width: 680px;
+    background: #F8F1FF;
+    border: solid 2px #333;
+    margin: 0 auto;
+}
+
+#page:after {
+    content: "."; 
+    display: block; 
+    height: 0; 
+    clear: both; 
+    visibility: hidden;
+}
+
+#banner h1 {
+    font-size: 32pt;
+    text-align: center;
+}
+
+#banner a,
+    #banner a:link,
+    #banner a:visited,
+    #banner a:active,
+    #banner a:hover {
+    color: #333;
+    text-decoration: none;
+}
+
+#sidebar {	
+    float:right;
+    font-family: arial, sans-serif;
+    font-size: 10pt;
+    padding:5px 5px 20px 5px;
+    width:90px;
+}
+    
+#blog {
+    border-right: dotted 1px black;
+    width:560px;
+    padding:20px 5px 20px 10px;
+}
+
+.tagline {
+    border-top: dotted 1px black;
+    border-bottom: dotted 1px black;
+    font-size: 11pt;
+    padding:3px;
+    text-align: center;
+}
+
+.dayHeader {
+    border: dotted 1px #888;
+    background: #FFFFF1;
+    color: #333;
+    float: left;
+    width: 70px;
+    font-size: 8pt;
+    font-family: arial, sans-serif;
+    margin-top: 4px;
+    padding:5px;
+    text-align: center;
+}
+
+.entry {
+    float: right;
+    width: 460px;
+    padding:0px 8px;
+}
+
+.entryTitle	{
+    font-size: 16pt;
+    line-height:120%;
+    color: #345;
+}			
+
+.entryTagline {
+    font-size: 9pt;
+    line-height:200%;
+    color: #345;
+}
+
+.entryContent {
+    font-family:arial, sans-serif;
+    color:#333;
+    font-size: 10pt;
+    font-weight:normal;
+    line-height:200%;
+    padding: 10px 0px;
+}
+
+.entryContent p {
+    padding: 0px;
+    margin: 0px;
+}
+
+.entryContent a,
+.entryContent a:link,
+.entryContent a:visited,
+.entryContent a:active,
+.entryContent a:hover {
+    font-weight: normal;
+    text-decoration: underline;
+}
+
+.entryFooter { 
+    margin-left:100px;
+    width:430px;
+    color:#334455;
+    font-family:arial, sans-serif;
+    font-size:8pt; 
+    text-align:right;
+    padding:3px;
+    padding:20px;
+}
+    
+.entryFooter a,
+.entryFooter a:link,
+.entryFooter a:visited,
+.entryFooter a:active,
+.entryFooter a:hover {
+    font-weight: normal;
+    text-decoration: underline;
+}
+
+.sidebarTitle {
+    color: #534;
+    font-size: 10pt;
+    padding:5px 0px;
+}
+
+.sidebarBox {
+    font-size: 8pt;
+    padding-top: 6px;
+}
+
+.sidebarBox ul, #archives ul {
+    margin:0px;
+    padding:0px;
+}
+
+.sidebarBox li, #archives li {
+    display: block;
+    list-style-image: none;
+    list-style-type: none;
+    padding-bottom: 3px;
+}
+
+#archives .entryTitle {
+    font-weight: normal;
+    padding: 0px 10px 10px 10px;
+}
+
+.sidebarBox p {
+    margin:0px;
+    padding:0px;
+}

data/share/default-blog-modes.yaml

@@ -0,0 +1,7 @@
+apache1-ssi: [apache-ssi]
+apache2-ssi: [apache-ssi, apache2-ssi]
+apache-comments: [cgi, apache-cgi, prototype, comments]
+# apache-wiki: [cgi, apache-cgi, wiki]
+# apache-publisher: [cgi, apache-cgi, prototype, publisher]
+apache1-all: [apache-ssi, cgi, apache-cgi, prototype, comments]
+apache2-all: [apache-ssi, apache2-ssi, cgi, apache-cgi, prototype, comments]

data/share/default-blog.apache-cgi.patch

@@ -0,0 +1,8 @@
+--- !hobix.com,2004/patches/^list
+htdocs/control/.htaccess: !^file-ensure |
+  AddHandler cgi-script .cgi
+  Options +FollowSymLinks +ExecCGI
+  
+  RewriteEngine   On
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule     ^(.*)$              /control/hobix.cgi

data/share/default-blog.apache-ssi.patch

@@ -0,0 +1,38 @@
+--- !hobix.com,2004/patches/^list
+hobix.yaml: !^yaml-merge
+  requires:
+  - local
+
+lib/local.rb: !^file-create |
+  module Hobix
+  class Weblog
+      def skel_sidebar( path_storage, section_path )
+          months = path_storage.get_months( storage.find )
+          page = Page.new( 'sidebar' )
+          page.updated = Time.now
+          yield :page => page, :months => months
+      end
+  end
+  class Out::Quick
+      def sidebar_erb
+          %{<!--#include virtual="<%= weblog.expand_path( 'sidebar.html' ) %>"-->}
+      end
+  end
+  end
+
+skel/sidebar.html.quick: !^file-create |
+  page: <+ sidebar +>
+  sidebar: |
+    <div id="sidebar">
+    <+ sidebar_list +>
+    </div>
+  
+  sidebar_archive: |
+    <div class="sidebarBox">
+    <h2 class="sidebarTitle">Archive</h2>
+    <ul>
+    <% months.reverse.each do |month_start, month_end, month_id| %>
+        <li><a href="<%= weblog.expand_path month_id %>"><%= month_start.strftime( "%B %Y" ) %></a></li>
+    <% end %>
+    </ul>
+    </div>

data/share/default-blog.apache2-ssi.patch

@@ -0,0 +1,3 @@
+--- !hobix.com,2004/patches/^list
+htdocs/.htaccess: !^file-ensure |
+  AddOutputFilter INCLUDES .html

data/share/default-blog.cgi.patch

@@ -0,0 +1,8 @@
+--- !hobix.com,2004/patches/^list
+htdocs/control/hobix.cgi: !^file-create |
+  #!/usr/bin/env ruby
+  require 'hobix/webapp'
+  require 'hobix/weblog'
+  Hobix::WebApp() do |web|
+    Hobix::Weblog.load( "../../hobix.yaml" ).facet_for( web )
+  end

data/share/default-blog.comments.patch

@@ -0,0 +1,5 @@
+--- !hobix.com,2004/patches/^list
+hobix.yaml: !^yaml-merge
+  requires:
+  - hobix/out/quick
+  - hobix/comments