lib/jekyll/archive.rb @@ -9,7 +9,13 @@ Gem::Specification.new do |s| s.email = ["tom@mojombo.com"] s.executables = ["jekyll"] s.extra_rdoc_files = ["History.txt", "Manifest.txt"] - s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "jekyll.gemspec", "lib/jekyll.rb", "lib/jekyll/albino.rb", "lib/jekyll/converters/csv.rb", "lib/jekyll/converters/mephisto.rb", "lib/jekyll/convertible.rb", "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "test/helper.rb", "test/source/_includes/sig.markdown", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts/2008-10-18-foo-bar.textile", "test/source/_posts/2008-11-21-complex.textile", "test/source/_posts/2008-12-13-include.markdown", "test/source/css/screen.css", "test/source/index.html", "test/source/posts/2008-12-03-permalinked-post.textile", "test/suite.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb"] + s.files = ["History.txt", "Manifest.txt", "README.textile", + "Rakefile", "bin/jekyll", "jekyll.gemspec", "lib/jekyll.rb", + "lib/jekyll/albino.rb", "lib/jekyll/converters/csv.rb", + "lib/jekyll/converters/mephisto.rb", "lib/jekyll/convertible.rb", + "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", + "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/archive.rb", + "lib/jekyll/site.rb", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "test/helper.rb", "test/source/_includes/sig.markdown", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts/2008-10-18-foo-bar.textile", "test/source/_posts/2008-11-21-complex.textile", "test/source/_posts/2008-12-13-include.markdown", "test/source/css/screen.css", "test/source/index.html", "test/source/posts/2008-12-03-permalinked-post.textile", "test/suite.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb"] s.has_rdoc = true s.rdoc_options = ["--main", "README.txt"] s.require_paths = ["lib"] jekyll.gemspec @@ -21,6 +21,7 @@ require 'jekyll/convertible' require 'jekyll/layout' require 'jekyll/page' require 'jekyll/post' +require 'jekyll/archive' require 'jekyll/filters' require 'jekyll/tags/highlight' require 'jekyll/tags/include' lib/jekyll.rb @@ -24,5 +24,13 @@ module Jekyll doc = Hpricot.parse(input) (doc/:"text()").to_s.split[0..words].join(' ') + truncate_string end + + def to_month(input) + return Date::MONTHNAMES[input.to_i] + end + + def to_month_abbr(input) + return Date::ABBR_MONTHNAMES[input.to_i] + end end end lib/jekyll/filters.rb @@ -2,7 +2,7 @@ module Jekyll class Site attr_accessor :source, :dest - attr_accessor :layouts, :posts + attr_accessor :layouts, :posts, :collated # Initialize the site # +source+ is String path to the source directory containing @@ -16,6 +16,7 @@ module Jekyll self.dest = dest self.layouts = {} self.posts = [] + self.collated = {} end # Do the actual work of processing the site and generating the @@ -26,6 +27,7 @@ module Jekyll self.read_layouts self.read_posts self.write_posts + self.write_archives self.transform_pages end @@ -58,8 +60,23 @@ module Jekyll entries.each do |f| self.posts << Post.new(self.source, f) if Post.valid?(f) end - + self.posts.sort! + + # build collated post structure for archives + self.posts.reverse.each do |post| + y, m, d = post.date.year, post.date.month, post.date.day + unless self.collated.key? y + self.collated[y] = {} + end + unless self.collated[y].key? m + self.collated[y][m] = {} + end + unless self.collated[y][m].key? d + self.collated[y][m][d] = [] + end + self.collated[y][m][d] += [post] + end rescue Errno::ENOENT => e # ignore missing layout dir end @@ -73,7 +90,41 @@ module Jekyll post.write(self.dest) end end - + + def write_archive(dir, type) + archive = Archive.new(self.source, dir, type) + archive.add_layout(self.layouts, site_payload) + archive.write(self.dest) + end + + # Write out archive pages based on special layouts. Yearly, + # monthly, and daily archives will be written if layouts exist. + # Yearly archives will be in <dest>/<year>/index.html and other archives + # will be generated similarly. + # + # Returns nothing. + def write_archives + self.collated.keys.each do |year| + if self.layouts.key? 'archive_yearly' + self.write_archive(year.to_s, 'archive_yearly') + end + + self.collated[year].keys.each do |month| + if self.layouts.key? 'archive_monthly' + self.write_archive(File.join(year.to_s, month.to_s), + 'archive_monthly') + end + + self.collated[year][month].keys.each do |day| + if self.layouts.key? 'archive_daily' + self.write_archive(File.join(year.to_s, month.to_s, day.to_s), + 'archive_daily') + end + end + end + end + end + # Copy all regular files from <source> to <dest>/ ignoring # any files/directories that are hidden (start with ".") or contain # site content (start with "_") @@ -106,12 +157,14 @@ module Jekyll end end end - + # The Hash payload containing site-wide data # # Returns {"site" => {"time" => <Time>, "posts" => [<Post>]}} def site_payload - {"site" => {"time" => Time.now, "posts" => self.posts.sort.reverse}} + {"site" => {"time" => Time.now, + "posts" => self.posts.sort.reverse, + "collated_posts" => self.collated}} end end lib/jekyll/site.rb 1367932e37f0d7e4757f85061ec6a3c56fccfd12 Jack Moffitt jack@metajack.im http://github.com/metajack/jekyll/commit/c8a1986d4c43e4ce8bf04e6ea3e3762840a96bfe c8a1986d4c43e4ce8bf04e6ea3e3762840a96bfe 2008-12-29T14:58:08-08:00 2008-12-29T14:14:55-08:00 Added archive support to Jekyll. This add special _layouts to generate archive pages yearly, monthly, and daily. It also adds site.collated_posts which provides all posts in a collated form for use in these and other layouts. 10e15df7e5875e1a67dd2eadb2f3f35b57ac7ec4 Jack Moffitt jack@metajack.im