bloggit 1.0.3 → 1.0.7

data/History

@@ -1,3 +1,32 @@
+== 1.0.7 / 2003-04-02
+
+* Experimental JSON Mongrel handler...
+* Tagged as version 1.0.7
+  [2008-04-02 20:24:55 -0500]
+* Absolute paths are availables for every link_to (uses the base_path from config)
+* RSS feeds generate absolute paths now
+* Post#to_yaml fixes
+* Sub-folders are globbed when looking for pages and/or posts
+* Added support for fetching latest posts that include, or exclude, a specified tag
+* Experimental embedded server
+* Fixed verbosity to actually honor the commandline
+* Exposed 'path_to_root' in Page rendering context
+  [2007-10-27 12:53:04 -0500]
+* Added 'content' to variable to context for pages and posts
+* Updated version number
+  [2007-10-27 11:39:14 -0500]
+* Updated gem manifest and the create_manifest task
+* Added a .gitignore file for this project
+  [2007-10-23 21:38:52 -0500]
+* Added JS Search plugin to test.blog fixture and boilerplate code.
+* FIX: No longer dies when the $/media folder is missing
+* Updated version number to 1.0.4
+  [2007-10-23 21:36:42 -0500]
+* Added JS Search plugin to test.blog fixture and boilerplate code.
+* FIX: No longer dies when the $/media folder is missing
+* Updated version number to 1.0.4
+
+
 == 1.0.0 / 2007-03-15
 
 * Initial release!

data/Manifest

@@ -13,6 +13,8 @@ lib/bloggit.rb
 lib/bloggit/boilerplate/Rakefile
 lib/bloggit/boilerplate/pages/about.page
 lib/bloggit/boilerplate/plugins/haloscan/init.rb
+lib/bloggit/boilerplate/plugins/js_search/init.rb
+lib/bloggit/boilerplate/plugins/js_search/scripts/search-engine.js
 lib/bloggit/boilerplate/settings.yml
 lib/bloggit/boilerplate/themes/default/styles/main.css
 lib/bloggit/boilerplate/themes/default/templates/archive.rhtml
@@ -396,6 +398,7 @@ test/fixtures/test.blog/pages/todo.page
 test/fixtures/test.blog/plugins/example/init.rb
 test/fixtures/test.blog/plugins/haloscan/init.rb
 test/fixtures/test.blog/plugins/js_search/init.rb
+test/fixtures/test.blog/plugins/js_search/scripts/search-engine.js
 test/fixtures/test.blog/plugins/rdoc_formatter/init.rb
 test/fixtures/test.blog/posts/2004.03.07_to-boldly-go.post
 test/fixtures/test.blog/posts/2007.03.25_sure-whatever.post

data/ReadMe

@@ -7,8 +7,10 @@
   
 Bloggit is a desktop blog generator.
 
+You can find the source at: http://repo.or.cz/w/bloggit.git
 
-== FEATURES/PROBLEMS:
+
+== FEATURES:
 
 * Static generation of blog 
 * Tags
@@ -47,7 +49,7 @@ If you have a publish target defined, you can publish using Rake as well:
 
 (The MIT License)
 
-Copyright (c) 2007 Matthew McCray
+Copyright (c) 2007-2008 Matthew McCray
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Todo

@@ -10,7 +10,9 @@ format: Markdown
 * Base page folder setting ( defaults to `'.'` ) 
 * Abstract content types (page, post, media)
 * Cleanup error messages, application-wide
-* Convert to MERB-style template names `filename.type.processor`. For example: `home.html.erb`
+* Glob files so sub-directories are scanned
+* Convert to MERB-style template names `filename.processor.type`. For example: `home.erb.page`. If a processor type is given, then it's processed via that utility.
+* (Page|Post).find_by_tag(s)
 
 ## Completed
 

data/lib/bloggit.rb

@@ -8,7 +8,7 @@ require 'active_support'
 require 'builder'
 
 module Bloggit
-  RELEASE_INFO = [1, 0, 3]
+  RELEASE_INFO = [1, 0, 7]
   VERSION = RELEASE_INFO.join('.')
 end
 

data/lib/bloggit/boilerplate/plugins/haloscan/init.rb

@@ -1,5 +1,23 @@
 # This is required automatically..
 
-Bloggit::Plugin.define :haloscan do |conf|
-  
+Bloggit::Plugin.register :haloscan do |settings|
+  $username = settings.fetch('username', '')
 end
+
+Bloggit::Template.register_tag :haloscan do |*args|
+  type, slug = args
+  case type
+
+    when :comments
+      %Q|<a href="javascript:HaloScan('#{slug}');" target="_self"><script type="text/javascript">postCount('#{slug}');</script></a>|
+      
+    when :trackbacks
+      %Q|<a href="javascript:HaloScanTB('#{slug}');" target="_self"><script type="text/javascript">postCountTB('#{slug}'); </script></a>|
+      
+    when :script
+      %Q|<script type="text/javascript" src="http://www.haloscan.com/load/#{$username}"> </script>|
+
+    else
+      'WHAT ELSE?'
+  end 
+end

data/lib/bloggit/boilerplate/plugins/js_search/init.rb

@@ -0,0 +1,69 @@
+# This is required automatically..
+
+Bloggit::Plugin.register :js_search do |settings|
+
+end
+
+Bloggit::Template.register_tag :js_search do |*args|
+  type, label = args
+  label ||= 'Search'
+  path = Bloggit::Template.current_template
+  case type
+
+    when :form
+      %Q|<form id="search-form" action="#" method="GET" onsubmit="Search.query(document.getElementById('q').value);return false;"><input class="search-query" type="search" name="q" id="q" placeholder=""/><input class="search-button" type="submit" value="#{label}"/></form>|
+
+    when :script
+      %Q|<script src="#{path.url_for :script=>'search-engine'}"></script><script>Search.index_uri='#{path.url_for :script=>'keyword-index'}';</script>|
+    else
+      '?'
+  end 
+end
+
+NOISE_WORDS = %w(about after all also an and another any are as at be because been before
+being between both but by came can come could did do each for from get
+got has had he have her here him himself his how if in into is it like
+make many me might more most much must my never now of on only or other
+our out over said same see should since some still such take than that
+the their them then there these they this those through to too under up
+very was way we well were what where which while who with would you your a
+b c d e f g h i j k l m n o p q r s t u v w x y z $ 1 2 3 4 5 6 7 8 9 0 _)
+
+Bloggit::on_event(:after_generate) do |site, cache_dir|
+  puts "Generating search index..."
+  
+  index_data = {
+    :count=>0,
+    :pages=>[]
+  }
+  
+  site.pages.each do |page|
+    msg = page.source.downcase
+    total_words = msg.split(' ').length
+    words = msg.gsub!( /[\W|_]/, ' ' ).split(' ')
+    words.uniq!
+    words.delete_if {|word| NOISE_WORDS.include?( word ) }
+    # TODO: Add path key that's the path from ROOT...
+    index_data[:pages] << { :title=>page.title,  'url'=>site.absolute_path_to(page), 'keywords'=>words.join(' '), :type=>'page' }
+    puts "  #{words.length.to_s.rjust(3,' ')}/#{total_words.to_s.ljust(3,' ')} - #{page.title} (page)"
+  end
+
+  site.posts.each do |post|
+    msg = post.source.downcase
+    msg += " #{post.tags.join(' ')} #{post.title}"
+    total_words = msg.split(' ').length
+    words = msg.gsub!( /[\W|_]/, ' ' ).split(' ')
+    words.uniq!
+    words.delete_if {|word| NOISE_WORDS.include?( word ) }
+    # TODO: Add path key that's the path from ROOT...
+    index_data[:pages] << { :title=>post.title,  'url'=>site.absolute_path_to(post), 'keywords'=>words.join(' '), :type=>'post' }
+    puts "  #{words.length.to_s.rjust(3,' ')}/#{total_words.to_s.ljust(3,' ')} - #{post.title} (post)"
+  end
+  
+  index_data[:count] = index_data[:pages].length
+  File.open( File.join(cache_dir, 'theme', 'scripts', 'keyword-index.js'), 'w') do |f|
+    f.write index_data.to_json
+  end
+  
+  FileUtils.cp File.join(site.base_path, 'plugins', 'js_search', 'scripts', 'search-engine.js'), File.join(cache_dir, 'theme', 'scripts', 'search-engine.js')
+end

data/lib/bloggit/boilerplate/plugins/js_search/scripts/search-engine.js

@@ -0,0 +1,71 @@
+// Simple Keyword Search Engine
+//
+//   Usage:
+//			Search.query(keyword) - returns array of matched pages
+
+window.Search = {
+	index_uri :'keyword-index.js', // Path to the keyword-index
+	_idx :null,
+
+	query :function(q) {
+		try {
+			this.fetch_index();
+
+		  var re = new RegExp(q, 'gi');
+			var results = [];
+
+		  for(var i=0; i<this._idx.pages.length; i++) {
+				var page = this._idx.pages[i];
+		    if( re.test(page.keywords) ) {
+					results.push( page );
+		    }
+		  }
+
+			this._onSearchComplete(results, q);
+		  return results;			
+		} catch (err) {
+			// If something went wrong... punt!
+			this._onError(err);
+		}
+	},
+
+	onFetchIndex :function(callback) {
+		this._onFetchIndex = callback;
+	},
+	_onFetchIndex :function(complete){},
+
+	onSearchComplete :function(callback) {
+		this._onSearchComplete = callback;
+	},
+	_onSearchComplete: function(results, q){  },
+
+	onError :function(callback) {
+		this._onError = callback;
+	},
+	_onError: function(err){ alert(err.message || err.description || err); },
+
+	fetch_index :function() {
+		if(this._idx == null) {
+			this._onFetchIndex(false);
+		  var xhr = this.get_xhr();
+	    xhr.open("GET", this.index_uri, false); // Synchronous loading...
+	    xhr.send("");
+		  eval("window.Search._idx = "+ xhr.responseText);
+			this._onFetchIndex(true);
+		}
+	},
+	get_xhr :function() {
+		return this.one_of_these(
+			function() {return new XMLHttpRequest()},
+    	function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+    	function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+		);
+	},
+	one_of_these :function() {
+    var returnValue;
+    for (var i=0; i<arguments.length; i++) {
+      try { returnValue = arguments[i](); break; } catch (ignore) {};
+    }
+    return returnValue;
+	}
+}

data/lib/bloggit/client/index.html

@@ -1,2 +1,111 @@
-<p>One moment...</p>
-<script>setTimeout("location.href='/main'", 2000);</script>
+<html>
+	<head>
+		<title><%= site.title %> :: Bloggit</title>
+		<style>
+			HTML, BODY {
+				font: normal 12px Verdana;
+				margin: 0; padding: 0;
+				border: 0 none;
+				overflow: hidden;
+				height: 100%;
+			}
+		</style>
+		<link rel="stylesheet" type="text/css" href="/scripts/resources/css/ext-all.css" />
+	 	<script type="text/javascript" src="/scripts/adapter/jquery/jquery.js"></script>
+	 	<script type="text/javascript" src="/scripts/adapter/jquery/jquery-plugins.js"></script>
+	 	<script type="text/javascript" src="/scripts/adapter/jquery/ext-jquery-adapter.js"></script>
+	 	<script type="text/javascript" src="/scripts/ext-all.js"></script>
+	 	<script type="text/javascript" src="/scripts/app.js"></script>
+		<style>
+			.x-layout-panel-south, x-layout-panel-north {
+				background-color: #c9defa !important;
+			}
+		</style>
+	</head>
+	<body>
+		<div id="container">
+			<div id="tab-pages">
+				<div id="pages-tb">
+					+ New Page,
+					- Delete (selected)
+				</div>
+				<div id="pages-grid">
+					Pages Grid
+				</div>
+				<div>Splitter?</div>
+				<div>Content Editor</div>
+				<div>Extra Info? (tags, title, slug, etc)</div>
+			</div>
+			<div id="tab-posts">
+				<div id="posts-tb"></div>
+				<div id="posts-grid" style="height:500">
+					Posts Grid
+				</div>
+				<div>
+					Splitter?
+				</div>
+				<div>
+					Content Editor (title, slug, publish data, status, etc)
+				</div>
+			</div>
+			<div id="tab-themes">
+				<div id="themes-tb">
+					+ New Theme
+				</div>
+				<div>
+					Theme Tree
+				</div>
+				<div>
+					Theme Editor
+				</div>
+			</div>
+			<div id="tab-plugins">
+				<div id="plugins-tb">
+					+ New Plugin,
+					- Disable (selected)
+				</div>
+				<div>
+					Plugin Tree
+				</div>
+				<div>
+					Plugin Editor
+				</div>
+			</div>
+			<div id="tab-media">
+				<div id="media-tb">
+					+ New Media,
+					- Delete (selected)
+				</div>
+				<div>
+					Media Tree View
+				</div>
+				<div>
+					Media Preview (?)
+				</div>
+			</div>
+			<div id="tab-settings">
+				Settings
+			</div>
+			<div id="tab-preview">
+				<div id="preview-tb">
+					@ Refresh,
+					# Regenerate
+				</div>
+				<div>
+					Preview IFRAME
+				</div>
+			</div>
+			<div id="site-header">
+				Bloggit <%= Bloggit::VERSION %>
+			</div>
+			<div id="home-page">
+				At your service, my dear.
+			</div>
+			<div id="status-bar">
+				Ready.
+			</div>
+		</div>
+	</body>
+</html>
+<!-- <p>One moment...</p>
+<script>setTimeout("location.href='/main'", 2000);</script> -->

data/lib/bloggit/client/scripts/app.js

@@ -97,12 +97,12 @@ Bloggit = (function(){
 			}
 			
 			var cm = new Ext.grid.ColumnModel([
-				{header: "Title", width: 180, dataIndex: 'title', id:'title', renderer:titleRenderer},
+				{header: "Title", width: 300, dataIndex: 'title', id:'title', renderer:titleRenderer},
 				{header: "Status", width: 115, dataIndex: 'status'},
 				{header: "Format", width: 100, dataIndex: 'format'},
 				{header: "Publish Date", width: 100, dataIndex: 'publish_date'},
 			]);
-	    	cm.defaultSortable = true;
+	    cm.defaultSortable = true;
 
 			dsPosts.load();
 			// create the grid

data/lib/bloggit/commandline.rb

@@ -33,7 +33,7 @@ module Bloggit
           opt.on("--verbose", "Be verbose when outputting info") {|t| Bloggit::Cmdline.verbose = true }
         end
 
-        #puts "Loading commands from #{File.join( File.dirname(__FILE__), 'commands', '*.rb')} (#{Bloggit::Cmdline.verbose})"
+        puts "Loading commands from #{File.join( File.dirname(__FILE__), 'commands', '*.rb')} (#{Bloggit::Cmdline.verbose})"
         Dir[ File.join( File.dirname(__FILE__), 'commands', '*.rb') ].each do |command|
           require command
         end

data/lib/bloggit/generator.rb

@@ -74,7 +74,7 @@ module Bloggit
 
       puts_if_verbose "Copying media files..."
       media_root = File.join(site.base_path, 'media')
-      FileUtils.cp_r media_root, cache_dir, :verbose=>false
+      FileUtils.cp_r media_root, cache_dir, :verbose=>false if File.exists?(media_root)
       
       puts_if_verbose "Copying '#{site.theme}' theme files..."
       create_folder 'theme'
@@ -123,6 +123,7 @@ module Bloggit
     
     def gen_post(post)
       ctx = {
+        'content' => post,
         'post' => post,
         'site' => @site
       }
@@ -134,6 +135,7 @@ module Bloggit
     
     def gen_page(page)
       ctx = {
+        'content' => page,
         'page' => page,
         'site' => @site
       }
@@ -238,6 +240,7 @@ module Bloggit
     def gen_atom_feed(posts, io_obj)
       tmpl = Template.from_text('')
       Template.folder_depth = 0
+      Template.force_absolute_path = true
 
       xml = Builder::XmlMarkup.new( :target=>io_obj, :indent=>2 )
       #xml.instruct! 'xml-stylesheet', :href=>'/stylesheets/atom.css', :type=>'text/css'
@@ -269,12 +272,14 @@ module Bloggit
           end
         end
       end
+      
+      Template.force_absolute_path = false
     end
     
     def gen_rss_feed(posts, io_obj)
       tmpl = Template.from_text('')
       Template.folder_depth = 0
-
+      Template.force_absolute_path = true
       xml = Builder::XmlMarkup.new( :target=>io_obj, :indent=>2 )
       xml.instruct! :xml, :version=>"1.0" 
       xml.rss(:version=>"2.0"){
@@ -295,6 +300,8 @@ module Bloggit
             end
         }
       }
+      Template.force_absolute_path = false
+      
     end
   
   private

data/lib/bloggit/media.rb

@@ -27,7 +27,7 @@ module Bloggit
     end
     
     class << self
-      private :new
+      #private :new
       
       # Creates a Media object from an image on the filesystem
       def from_file(path, site) 

data/lib/bloggit/page.rb

@@ -73,6 +73,14 @@ module Bloggit
     class << self
       private :new
       
+      def find_by_tag(tag)
+        find_by_tags( [tag] )
+      end
+      
+      def find_by_tags(tags=[])
+        
+      end
+      
       def from_file(path, site=nil)
         path = File.expand_path(path)
         raise "File must exist" unless File.exists?( path )

data/lib/bloggit/plugin.rb

@@ -12,11 +12,10 @@ module Bloggit
     include Test::Unit::Assertions
     
     class << self
-      attr_reader :site
+      attr_reader :site, :plugins
       
       def init(site) #:nodoc:
         @site = site
-        
         @plugins = {}
         # Load/require plugins from plugins/ dir...
         @plugin_path = File.join(site.base_path, 'plugins')
@@ -35,8 +34,7 @@ module Bloggit
       
       def register(plugin_name, opts={}, &block)
         # Yeah...
-        @plugins[plugin_name]
-        block.call( settings_for(plugin_name) )
+        @plugins[plugin_name] = block.call( settings_for(plugin_name) )
       end
       
       def settings_for(plugin_name)
@@ -46,6 +44,11 @@ module Bloggit
       def active_site
         @site
       end
+      
+      def [](key)
+        @plugins[key]
+      end
+      
     end
   end
   

data/lib/bloggit/post.rb

@@ -108,8 +108,7 @@ module Bloggit
     end
     
     def to_yaml
-    	data_hash = prepare_data
-      yml_s = data_hsh.to_yaml
+      yml_s = prepare_data.to_yaml
       yml_s << @source.to_yaml
     end
     

data/lib/bloggit/site.rb

@@ -31,7 +31,7 @@ module Bloggit
       @pages = []
       @page_hsh = {}
       @inactive_pages = []
-      Dir[ File.join(base_path, 'pages', '*.page') ].each do |page_path|
+      Dir.glob( File.join(base_path, 'pages', '**', '*.page') ).each do |page_path|
         page = Page.from_file(page_path, self)
         if page.is_publishable?
           @pages << page
@@ -49,7 +49,7 @@ module Bloggit
       @posts = []
       @inactive_posts = []
       @post_hsh = {}
-      Dir[ File.join(base_path, 'posts', '*.post') ].each do |post_path|
+      Dir.glob( File.join(base_path, 'posts', '**', '*.post') ).each do |post_path|
         post = Post.from_file(post_path, self)
         if post.is_publishable?
           @posts << post
@@ -65,7 +65,7 @@ module Bloggit
       
       # Load Media... (?)
       @media = {}
-      Dir[ File.join(base_path, 'media', '**', '*') ].each do |media_path|
+      Dir.glob( File.join(base_path, 'media', '**', '*') ).each do |media_path|
         unless FileTest.directory?(media_path)
           media_item = Media.from_file(media_path, self)
           @media[ media_item.relative_path ] = media_item
@@ -107,6 +107,30 @@ module Bloggit
       limit = @settings.syndication.fetch('number_of_entries', 10) if limit.nil?
       @posts[0..limit]
     end
+
+    def latest_posts_excluding_tag(limit=nil, tag=nil)
+      limit = @settings.syndication.fetch('number_of_entries', 10) if limit.nil?
+      latest = @posts.select do |post|
+        if post.has_tags? && !post.tags.include?(tag)
+          true
+        else
+          false
+        end
+      end
+      latest[0..limit]
+    end
+
+    def latest_posts_with_tag(limit=nil, tag=nil)
+      limit = @settings.syndication.fetch('number_of_entries', 10) if limit.nil?
+      latest = @posts.select do |post|
+        if post.has_tags? && post.tags.include?(tag)
+          true
+        else
+          false
+        end
+      end
+      latest[0..limit]
+    end
     
     def absolute_path_to(obj)
       case obj.class.to_s

data/lib/bloggit/tasks/client.rb

@@ -4,6 +4,18 @@ require 'bloggit'
 desc "Runs the (Browser) client"
 task :client do
 	# This is ugly -- find a better way!
-	`open http://127.0.0.1:3322`
-	Bloggit::Server.run()
+	fork do
+    Bloggit::Server.run()
+  end
+  
+  # A pathetic hack to delay for a fraction of second the starting of the browser...
+  1000000.times {|i| i.to_s }
+  
+  begin
+	  `open http://127.0.0.1:3322`
+  rescue
+    # This may fail ???
+  end
+
+	Process.wait
 end

data/lib/bloggit/tasks/publishing.rb

@@ -2,13 +2,15 @@
 require 'rake'
 require 'bloggit'
 
+VERBOSE = true unless defined?(VERBOSE)
+
 task :default=>:generate
 
 desc "Generate static HTML in cache"
 task :generate=>[:cleanup] do
   # Generate the HTML site and structure under cache/
   site = Bloggit::Site.from_file('.') #File.dirname( __FILE__ )
-  gen = Bloggit::Generator.new(site, true)
+  gen = Bloggit::Generator.new(site, VERBOSE)
   gen.generate_cache
 end
 
@@ -16,7 +18,7 @@ desc "Upload cache to target location"
 task :upload do
   # Copy/SFTP/FTP site from cache/ to target location defined in settings.yml (?)
   site = Bloggit::Site.from_file('.') #File.dirname( __FILE__ )
-  pub = Bloggit::Publisher.new(site, true)
+  pub = Bloggit::Publisher.new(site, VERBOSE)
   pub.upload
 end
 
@@ -29,7 +31,7 @@ desc "Removes site cache"
 task :cleanup do
   # Kill the files/folders under cache/
   site = Bloggit::Site.from_file('.', true) #File.dirname( __FILE__ )
-  pub = Bloggit::Generator.new(site, true)
+  pub = Bloggit::Generator.new(site, VERBOSE)
   pub.cleanup_cache
 end
 

data/lib/bloggit/template.rb

@@ -63,47 +63,49 @@ module Bloggit
     end
     
     def url_for(params={})
+      absolute = params.fetch(:absolute, false)
+      
       if post = params.delete(:post)
         if post.is_a? String
-          Template.path_to_root + site.get_post_by_slug(post).permalink
+          Template.path_to_root(absolute) + site.get_post_by_slug(post).permalink
         elsif post.is_a? Post
-          Template.path_to_root + post.permalink
+          Template.path_to_root(absolute) + post.permalink
         end
         
       elsif page = params.delete(:page)
         if page.is_a? String
-          Template.path_to_root + site.get_page_by_slug(page).permalink
+          Template.path_to_root(absolute) + site.get_page_by_slug(page).permalink
         elsif page.is_a? Page
-          Template.path_to_root + page.permalink
+          Template.path_to_root(absolute) + page.permalink
         end
 
       elsif tag = params.delete(:tag)
         if tag.is_a? String
-          Template.path_to_root + Tag.tag_list[tag].permalink
+          Template.path_to_root(absolute) + Tag.tag_list[tag].permalink
         elsif tag.is_a? Tag
-          Template.path_to_root + tag.permalink
+          Template.path_to_root(absolute) + tag.permalink
         end
 
       elsif media = params.delete(:media)
         if media.is_a? String
-          Template.path_to_root + site.media[media].permalink
+          Template.path_to_root(absolute) + site.media[media].permalink
         elsif media.is_a? Media
-          Template.path_to_root + media.permalink
+          Template.path_to_root(absolute) + media.permalink
         end
 
       elsif script = params.delete(:script)
         script += '.js' unless script.ends_with? '.js'
-        "#{ Template.path_to_root }theme/scripts/#{ script }"
+        "#{ Template.path_to_root(absolute) }theme/scripts/#{ script }"
         
       elsif style = params.delete(:style)
         style += '.css' unless style.ends_with? '.css'
-        "#{ Template.path_to_root }theme/styles/#{ style }"
+        "#{ Template.path_to_root(absolute) }theme/styles/#{ style }"
 
       elsif image = params.delete(:image)
-        "#{ Template.path_to_root }theme/images/#{ image }"
+        "#{ Template.path_to_root(absolute) }theme/images/#{ image }"
         
       elsif path = params.delete(:from_root)
-        Template.path_to_root + path
+        Template.path_to_root(absolute) + path
         
       elsif url = params.delete(:url)
         url
@@ -111,24 +113,24 @@ module Bloggit
       end
     end
     
-    def tag_links(obj)
+    def tag_links(obj, absolute=false)
       links = []
       obj.tags.each do |tag| 
-        links << link_to(tag, :tag=>tag)
+        links << link_to(tag, :tag=>tag, :absolute=>absolute)
       end
       links
     end
 
-    def url_for_blog
-      "#{ Template.path_to_root }#{site.build_post_path('index.html')}"
+    def url_for_blog(params={})
+      "#{ Template.path_to_root(params.fetch(:absolute, false)) }#{site.build_post_path('index.html')}"
     end
     
-    def url_for_home
-      "#{ Template.path_to_root }index.html"
+    def url_for_home(params={})
+      "#{ Template.path_to_root(params.fetch(:absolute, false)) }index.html"
     end
     
-    def url_for_feed
-      "#{ Template.path_to_root }#{site.settings.syndication.filename}"
+    def url_for_feed(params={})
+      "#{ Template.path_to_root(params.fetch(:absolute, false)) }#{site.settings.syndication.filename}"
     end
     
     def link_to(title, params={})
@@ -166,6 +168,9 @@ module Bloggit
       link_to image_tag, params
     end
     
+    def path_to_root(absolute=false)
+      Template.path_to_root(absolute)
+    end
     
     # def link_to_archive(title, params={})
     #   atts = ""
@@ -255,7 +260,7 @@ module Bloggit
     class << self
       private :new
       
-      attr_accessor :site, :template_dir, :content_parts, :src_path, :current_template, :folder_depth
+      attr_accessor :site, :template_dir, :content_parts, :src_path, :current_template, :folder_depth, :force_absolute_path
 
       include Test::Unit::Assertions
 
@@ -266,6 +271,7 @@ module Bloggit
         @is_ready = true
         @template_cache = {}
         @content_parts = {}
+        @force_absolute_path = false
       end
       
       # Do not call directly!
@@ -298,8 +304,14 @@ module Bloggit
         set_content_for(key, value)
       end
       
-      def path_to_root
-        '../' * @folder_depth
+      def path_to_root(absolute_path = false)
+        path_to_root = '../' * @folder_depth
+        if @force_absolute_path || absolute_path
+          root_url = @site.settings.syndication.fetch('base_url', '')
+          [root_url, path_to_root].join('/')
+        else
+          path_to_root
+        end
       end
       
       def from_file(path)

data/lib/util/fixed_hoe.rb

@@ -499,7 +499,7 @@ class FixedHoe #:nodoc:
       files = []
       Find.find '.' do |path|
         next unless File.file? path
-        next if path =~ /\.svn|tmp$|CVS/
+        next if path =~ /\.svn|tmp$|CVS|\.git/
         files << path[2..-1]
       end
       files = files.sort.join "\n"

data/test/fixtures/test.blog/plugins/haloscan/init.rb

@@ -1,11 +1,10 @@
 # This is required automatically..
-include Bloggit
 
-Plugin.register :haloscan do |settings|
+Bloggit::Plugin.register :haloscan do |settings|
   $username = settings.fetch('username', '')
 end
 
-Template.register_tag :haloscan do |*args|
+Bloggit::Template.register_tag :haloscan do |*args|
   type, slug = args
   case type
 
@@ -20,6 +19,5 @@ Template.register_tag :haloscan do |*args|
 
     else
       'WHAT ELSE?'
-  end
-    
+  end 
 end

data/test/fixtures/test.blog/plugins/js_search/init.rb

@@ -1,51 +1,69 @@
-# include Bloggit
-# 
-# # Registering plugin to retrieve settings from settings.yml
-# Plugin.register :js_search do |settings|
-#   $username = settings.fetch('username', '')
-# end
-# 
-# 
-# # Registering custom tags in the template engine
-# Template.register_tag :js_search do |*args|
-#   type, opts = args
-#   opts ||= {}
-# 
-#   case type
-#     when :form
-#       %Q|<a href="javascript:HaloScanTB('#{slug}');" target="_self"><script type="text/javascript">postCountTB('#{slug}'); </script></a>|
-#       
-#     when :template
-#       puts opts[:block].call()
-#       
-#     when :script
-#       %Q|<script type="text/javascript" src="http://www.haloscan.com/load/#{settings.fetch('username', '')}"> </script>|
-#       
-#     else
-#       'WHAT ELSE?'
-#   end
-#     
-# end
-# 
-# # Responding to application events...
-# Bloggit::on_event(:after_generate) do |site, cache_dir|
-#   puts "Generating search index..."
-#   # TODO: Copy/create JS Search lib in cache/ ...
-#   # TODO: Generate index JS file ...
-# end
-# 
-# 
-# # Adding a command line tool...
-# Cmdline.register do |cmd, site|
-#    search_cmd = CmdParse::Command.new( 'search', true, true )
-#    search_cmd.short_desc = "JS Search Tools (plugin)"
-#    cmd.add_command( search_cmd )
-# 
-#    idx = CmdParse::Command.new( 'index', false )
-#    idx.short_desc = "Create search index"
-#    idx.set_execution_block do |args|
-#      puts "Generating index file(s)..."
-#    end
-# 
-#    search_cmd.add_command( idx )
-# end
+# This is required automatically..
+
+Bloggit::Plugin.register :js_search do |settings|
+
+end
+
+Bloggit::Template.register_tag :js_search do |*args|
+  type, label = args
+  label ||= 'Search'
+  path = Bloggit::Template.current_template
+  case type
+
+    when :form
+      %Q|<form id="search-form" action="#" method="GET" onsubmit="Search.query(document.getElementById('q').value);return false;"><input class="search-query" type="search" name="q" id="q" placeholder=""/><input class="search-button" type="submit" value="#{label}"/></form>|
+
+    when :script
+      %Q|<script src="#{path.url_for :script=>'search-engine'}"></script><script>Search.index_uri='#{path.url_for :script=>'keyword-index'}';</script>|
+    else
+      '?'
+  end 
+end
+
+NOISE_WORDS = %w(about after all also an and another any are as at be because been before
+being between both but by came can come could did do each for from get
+got has had he have her here him himself his how if in into is it like
+make many me might more most much must my never now of on only or other
+our out over said same see should since some still such take than that
+the their them then there these they this those through to too under up
+very was way we well were what where which while who with would you your a
+b c d e f g h i j k l m n o p q r s t u v w x y z $ 1 2 3 4 5 6 7 8 9 0 _)
+
+Bloggit::on_event(:after_generate) do |site, cache_dir|
+  puts "Generating search index..."
+  
+  index_data = {
+    :count=>0,
+    :pages=>[]
+  }
+  
+  site.pages.each do |page|
+    msg = page.source.downcase
+    total_words = msg.split(' ').length
+    words = msg.gsub!( /[\W|_]/, ' ' ).split(' ')
+    words.uniq!
+    words.delete_if {|word| NOISE_WORDS.include?( word ) }
+    # TODO: Add path key that's the path from ROOT...
+    index_data[:pages] << { :title=>page.title,  'url'=>site.absolute_path_to(page), 'keywords'=>words.join(' '), :type=>'page' }
+    puts "  #{words.length.to_s.rjust(3,' ')}/#{total_words.to_s.ljust(3,' ')} - #{page.title} (page)"
+  end
+
+  site.posts.each do |post|
+    msg = post.source.downcase
+    msg += " #{post.tags.join(' ')} #{post.title}"
+    total_words = msg.split(' ').length
+    words = msg.gsub!( /[\W|_]/, ' ' ).split(' ')
+    words.uniq!
+    words.delete_if {|word| NOISE_WORDS.include?( word ) }
+    # TODO: Add path key that's the path from ROOT...
+    index_data[:pages] << { :title=>post.title,  'url'=>site.absolute_path_to(post), 'keywords'=>words.join(' '), :type=>'post' }
+    puts "  #{words.length.to_s.rjust(3,' ')}/#{total_words.to_s.ljust(3,' ')} - #{post.title} (post)"
+  end
+  
+  index_data[:count] = index_data[:pages].length
+  File.open( File.join(cache_dir, 'theme', 'scripts', 'keyword-index.js'), 'w') do |f|
+    f.write index_data.to_json
+  end
+  
+  FileUtils.cp File.join(site.base_path, 'plugins', 'js_search', 'scripts', 'search-engine.js'), File.join(cache_dir, 'theme', 'scripts', 'search-engine.js')
+end

data/test/fixtures/test.blog/plugins/js_search/scripts/search-engine.js

@@ -0,0 +1,71 @@
+// Simple Keyword Search Engine
+//
+//   Usage:
+//			Search.query(keyword) - returns array of matched pages
+
+window.Search = {
+	index_uri :'keyword-index.js', // Path to the keyword-index
+	_idx :null,
+
+	query :function(q) {
+		try {
+			this.fetch_index();
+
+		  var re = new RegExp(q, 'gi');
+			var results = [];
+
+		  for(var i=0; i<this._idx.pages.length; i++) {
+				var page = this._idx.pages[i];
+		    if( re.test(page.keywords) ) {
+					results.push( page );
+		    }
+		  }
+
+			this._onSearchComplete(results, q);
+		  return results;			
+		} catch (err) {
+			// If something went wrong... punt!
+			this._onError(err);
+		}
+	},
+
+	onFetchIndex :function(callback) {
+		this._onFetchIndex = callback;
+	},
+	_onFetchIndex :function(complete){},
+
+	onSearchComplete :function(callback) {
+		this._onSearchComplete = callback;
+	},
+	_onSearchComplete: function(results, q){  },
+
+	onError :function(callback) {
+		this._onError = callback;
+	},
+	_onError: function(err){ alert(err.message || err.description || err); },
+
+	fetch_index :function() {
+		if(this._idx == null) {
+			this._onFetchIndex(false);
+		  var xhr = this.get_xhr();
+	    xhr.open("GET", this.index_uri, false); // Synchronous loading...
+	    xhr.send("");
+		  eval("window.Search._idx = "+ xhr.responseText);
+			this._onFetchIndex(true);
+		}
+	},
+	get_xhr :function() {
+		return this.one_of_these(
+			function() {return new XMLHttpRequest()},
+    	function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+    	function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+		);
+	},
+	one_of_these :function() {
+    var returnValue;
+    for (var i=0; i<arguments.length; i++) {
+      try { returnValue = arguments[i](); break; } catch (ignore) {};
+    }
+    return returnValue;
+	}
+}

metadata

@@ -1,33 +1,79 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: bloggit
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2007-10-23 00:00:00 -05:00
-summary: A static site generator for a blog with static pages
-require_paths: 
-- lib
-email: darthapo@gmail.com
-homepage: http://www.mattmccray.com
-rubyforge_project: bloggit
-description: "== FEATURES/PROBLEMS:  * Static generation of blog  * Tags * Archives * ERb based layout support * ERb processing in pages/posts * Simple static pages * Comments (via Haloscan) * Searching (using JavaScript)  == SYNOPSIS:  You can generate the site from the commandline using Rake:"
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.7
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - M@ McCray
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-04-02 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cmdparse
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: BlueCloth
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: markaby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: "You can find the source at: http://repo.or.cz/w/bloggit.git  == FEATURES:  * Static generation of blog  * Tags * Archives * ERb based layout support * ERb processing in pages/posts * Simple static pages * Comments (via Haloscan) * Searching (using JavaScript)  == SYNOPSIS:"
+email: darthapo@gmail.com
+executables: 
+- bloggit
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - History
 - Manifest
@@ -44,6 +90,8 @@ files:
 - lib/bloggit/boilerplate/Rakefile
 - lib/bloggit/boilerplate/pages/about.page
 - lib/bloggit/boilerplate/plugins/haloscan/init.rb
+- lib/bloggit/boilerplate/plugins/js_search/init.rb
+- lib/bloggit/boilerplate/plugins/js_search/scripts/search-engine.js
 - lib/bloggit/boilerplate/settings.yml
 - lib/bloggit/boilerplate/themes/default/styles/main.css
 - lib/bloggit/boilerplate/themes/default/templates/archive.rhtml
@@ -427,6 +475,7 @@ files:
 - test/fixtures/test.blog/plugins/example/init.rb
 - test/fixtures/test.blog/plugins/haloscan/init.rb
 - test/fixtures/test.blog/plugins/js_search/init.rb
+- test/fixtures/test.blog/plugins/js_search/scripts/search-engine.js
 - test/fixtures/test.blog/plugins/rdoc_formatter/init.rb
 - test/fixtures/test.blog/posts/2004.03.07_to-boldly-go.post
 - test/fixtures/test.blog/posts/2007.03.25_sure-whatever.post
@@ -451,70 +500,31 @@ files:
 - test/unit/site_test.rb
 - test/unit/template_test.rb
 - test/unit/text_formatter_test.rb
-test_files: []
-
+has_rdoc: true
+homepage: http://www.mattmccray.com
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- bloggit
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: cmdparse
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: BlueCloth
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: markaby
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+rubyforge_project: bloggit
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A static site generator for a blog with static pages
+test_files: []
+