jekyll 0.3.0 → 0.4.1

data/lib/jekyll/convertible.rb

@@ -24,16 +24,26 @@ module Jekyll
     #
     # Returns nothing
     def transform
-      case self.ext
-      when ".textile":
+      case Jekyll.content_type
+      when :textile
         self.ext = ".html"
         self.content = RedCloth.new(self.content).to_html
-      when ".markdown":
+      when :markdown
         self.ext = ".html"
         self.content = Jekyll.markdown_proc.call(self.content)
       end
     end
     
+    def determine_content_type
+      case self.ext[1..-1]
+      when /textile/i
+        return :textile
+      when /markdown/i, /mkdn/i, /md/i
+        return :markdown
+      end      
+      return :unknown
+    end
+    
     # Add any necessary layouts to this convertible document
     #   +layouts+ is a Hash of {"name" => "layout"}
     #   +site_payload+ is the site payload hash
@@ -41,6 +51,7 @@ module Jekyll
     # Returns nothing
     def do_layout(payload, layouts)
       # render and transform content (this becomes the final content of the object)
+      Jekyll.content_type = self.determine_content_type
       self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters])
       self.transform
       

data/lib/jekyll/filters.rb

@@ -14,11 +14,26 @@ module Jekyll
     end
     
     def xml_escape(input)
-      input.gsub("<", "&lt;").gsub(">", "&gt;")
+      input.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
     end
     
     def number_of_words(input)
       input.split.length
-    end    
+    end
+    
+    def array_to_sentence_string(array)
+      connector = "and"
+      case array.length
+      when 0
+        ""
+      when 1
+        array[0].to_s
+      when 2
+        "#{array[0]} #{connector} #{array[1]}"
+      else
+        "#{array[0...-1].join(', ')}, #{connector} #{array[-1]}"
+      end
+    end
+
   end  
-end
+end

data/lib/jekyll/post.rb

@@ -61,15 +61,19 @@ module Jekyll
     # The generated directory into which the post will be placed
     # upon generation. This is derived from the permalink or, if
     # permalink is absent, set to the default date
-    # e.g. "/2008/11/05/"
+    # e.g. "/2008/11/05/" if the permalink style is :date, otherwise nothing
     #
     # Returns <String>
     def dir
       if permalink
-        permalink.to_s.split("/")[0..-2].join("/")
+        permalink.to_s.split("/")[0..-2].join("/") + '/'
       else
         prefix = self.categories.empty? ? '' : '/' + self.categories.join('/')
-        prefix + date.strftime("/%Y/%m/%d/")
+        if Jekyll.permalink_style == :date
+          prefix + date.strftime("/%Y/%m/%d/")
+        else
+          prefix + '/'
+        end
       end
     end
     
@@ -87,7 +91,7 @@ module Jekyll
     #
     # Returns <String>
     def url
-      self.dir + self.slug + ".html"
+      permalink || self.dir + self.slug + ".html"
     end
     
     # The UID for this post (useful in feeds)
@@ -154,7 +158,7 @@ module Jekyll
     #
     # Returns <Hash>
     def to_liquid
-      { "title" => self.data["title"] || "",
+      { "title" => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '),
         "url" => self.url,
         "date" => self.date,
         "id" => self.id,

data/lib/jekyll/site.rb

@@ -2,7 +2,7 @@ module Jekyll
   
   class Site
     attr_accessor :source, :dest
-    attr_accessor :layouts, :posts
+    attr_accessor :layouts, :posts, :categories
     
     # 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.categories = Hash.new { |hash, key| hash[key] = Array.new }
     end
     
     # Do the actual work of processing the site and generating the
@@ -63,6 +64,7 @@ module Jekyll
         if Post.valid?(f)
           post = Post.new(self.source, dir, f)
           self.posts << post
+          post.categories.each { |c| self.categories[c] << post }
         end
       end
       
@@ -72,6 +74,7 @@ module Jekyll
       end
       
       self.posts.sort!
+      self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
@@ -88,7 +91,8 @@ module Jekyll
     # Copy all regular files from <source> to <dest>/ ignoring
     # any files/directories that are hidden or backup files (start
     # with "." or end with "~") or contain site content (start with "_")
-    # unless they are "_posts" directories
+    # unless they are "_posts" directories or web server files such as
+    # '.htaccess'
     #   The +dir+ String is a relative path used to call this method
     #            recursively as it descends through directories
     #
@@ -98,8 +102,10 @@ module Jekyll
       entries = Dir.entries(base)
       entries = entries.reject { |e| e[-1..-1] == '~' }
       entries = entries.reject do |e|
-        (e != '_posts') and ['.', '_'].include?(e[0..0])
+        (e != '_posts') and ['.', '_'].include?(e[0..0]) unless ['.htaccess'].include?(e)
       end
+      directories = entries.select { |e| File.directory?(File.join(base, e)) }
+      files = entries.reject { |e| File.directory?(File.join(base, e)) }
 
       # we need to make sure to process _posts *first* otherwise they 
       # might not be available yet to other templates as {{ site.posts }}
@@ -107,42 +113,53 @@ module Jekyll
         entries.delete('_posts')
         read_posts(dir)
       end
-
-      entries.each do |f|
-        if File.directory?(File.join(base, f))
-          next if self.dest.sub(/\/$/, '') == File.join(base, f)
-          transform_pages(File.join(dir, f))
-        else
-          first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
-          
-          if first3 == "---"
-            # file appears to have a YAML header so process it as a page
-            page = Page.new(self.source, dir, f)
-            page.render(self.layouts, site_payload)
-            page.write(self.dest)
+      [directories, files].each do |entries|
+        entries.each do |f|
+          if File.directory?(File.join(base, f))
+            next if self.dest.sub(/\/$/, '') == File.join(base, f)
+            transform_pages(File.join(dir, f))
           else
-            # otherwise copy the file without transforming it
-            FileUtils.mkdir_p(File.join(self.dest, dir))
-            FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
+            first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
+        
+            if first3 == "---"
+              # file appears to have a YAML header so process it as a page
+              page = Page.new(self.source, dir, f)
+              page.render(self.layouts, site_payload)
+              page.write(self.dest)
+            else
+              # otherwise copy the file without transforming it
+              FileUtils.mkdir_p(File.join(self.dest, dir))
+              FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
+            end
           end
         end
       end
     end
-    
+
+    # Constructs a hash map of Posts indexed by the specified Post attribute
+    #
+    # Returns {post_attr => [<Post>]}
+    def post_attr_hash(post_attr)
+      # Build a hash map based on the specified post attribute ( post attr => array of posts )
+      # then sort each array in reverse order
+      hash = Hash.new { |hash, key| hash[key] = Array.new }
+      self.posts.each { |p| p.send(post_attr.to_sym).each { |t| hash[t] << p } }
+      hash.values.map { |sortme| sortme.sort! { |a, b| b <=> a} }
+      return hash
+    end
+
     # The Hash payload containing site-wide data
     #
-    # Returns {"site" => {"time" => <Time>, "posts" => [<Post>]}}
+    # Returns {"site" => {"time" => <Time>,
+    #                     "posts" => [<Post>],
+    #                     "categories" => [<Post>],
+    #                     "topics" => [<Post>] }}
     def site_payload
-      # Build the category hash map of category ( names => arrays of posts )
-      # then sort each array in reverse order
-      categories = Hash.new { |hash, key| hash[key] = Array.new }
-      self.posts.each { |p| p.categories.each { |c| categories[c] << p } }
-      categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
-      
       {"site" => {
         "time" => Time.now, 
         "posts" => self.posts.sort { |a,b| b <=> a },
-        "categories" => categories
+        "categories" => post_attr_hash('categories'),
+        "topics" => post_attr_hash('topics')
       }}
     end
   end

data/lib/jekyll/tags/highlight.rb

@@ -2,10 +2,22 @@ module Jekyll
   
   class HighlightBlock < Liquid::Block
     include Liquid::StandardFilters
+    # we need a language, but the linenos argument is optional.
+    SYNTAX = /(\w+)\s?(:?linenos)?\s?/
     
-    def initialize(tag_name, lang, tokens)
+    def initialize(tag_name, markup, tokens)
       super
-      @lang = lang.strip
+      if markup =~ SYNTAX
+        @lang = $1
+        if defined? $2
+          # additional options to pass to Albino.
+          @options = { 'O' => 'linenos=inline' }
+        else
+          @options = {}
+        end
+      else
+        raise SyntaxError.new("Syntax Error in 'highlight' - Valid syntax: highlight <lang> [linenos]")
+      end
     end
   
     def render(context)
@@ -17,7 +29,11 @@ module Jekyll
     end
     
     def render_pygments(context, code)
-      "<notextile>" + Albino.new(code, @lang).to_s + "</notextile>"
+      if Jekyll.content_type == :markdown
+        return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
+      else
+        "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
+      end
     end
     
     def render_codehighlighter(context, code)
@@ -34,4 +50,4 @@ module Jekyll
   
 end
 
-Liquid::Template.register_tag('highlight', Jekyll::HighlightBlock)
+Liquid::Template.register_tag('highlight', Jekyll::HighlightBlock)

data/lib/jekyll/tags/include.rb

@@ -14,7 +14,11 @@ module Jekyll
       Dir.chdir(File.join(Jekyll.source, '_includes')) do
         choices = Dir['**/*'].reject { |x| File.symlink?(x) }
         if choices.include?(@file)
-          File.read(@file)
+          source = File.read(@file)
+          partial = Liquid::Template.parse(source)
+          context.stack do
+            partial.render(context)
+          end
         else
           "Included file '#{@file}' not found in _includes directory"
         end
@@ -24,4 +28,4 @@ module Jekyll
   
 end
 
-Liquid::Template.register_tag('include', Jekyll::IncludeTag)
+Liquid::Template.register_tag('include', Jekyll::IncludeTag)

data/test/dest/2008/10/18/foo-bar.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+   <title>Foo Bar</title>
+   <meta name="author" content="<%= @page.author %>" />
+
+   <!-- CodeRay syntax highlighting CSS -->
+   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
+
+   <!-- Homepage CSS -->
+   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
+</head>
+<body>
+
+<div class="site">
+  <div class="title">
+    Tom Preston-Werner
+  </div>
+  
+  <h1>Foo Bar</h1>
+<p>Best <strong>post</strong> ever</p>
+</div>
+
+</body>
+</html>

data/test/dest/2008/11/21/complex.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+   <title>Complex</title>
+   <meta name="author" content="<%= @page.author %>" />
+
+   <!-- CodeRay syntax highlighting CSS -->
+   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
+
+   <!-- Homepage CSS -->
+   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
+</head>
+<body>
+
+<div class="site">
+  <div class="title">
+    Tom Preston-Werner
+  </div>
+  
+  <p>url: /2008/11/21/complex.html<br />
+date: Fri Nov 21 00:00:00 -0800 2008<br />
+id: /2008/11/21/complex</p>
+</div>
+
+</body>
+</html>

data/test/dest/2008/12/13/include.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+   <title>Include</title>
+   <meta name="author" content="<%= @page.author %>" />
+
+   <!-- CodeRay syntax highlighting CSS -->
+   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
+
+   <!-- Homepage CSS -->
+   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
+</head>
+<body>
+
+<div class="site">
+  <div class="title">
+    Tom Preston-Werner
+  </div>
+  
+  <hr />
+<p>Tom Preston-Werner github.com/mojombo</p>
+
+<p>This <em>is</em> cool</p>
+</div>
+
+</body>
+</html>

data/test/dest/_posts/2008-10-18-foo-bar.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+   <title>Foo Bar</title>
+   <meta name="author" content="<%= @page.author %>" />
+
+   <!-- CodeRay syntax highlighting CSS -->
+   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
+
+   <!-- Homepage CSS -->
+   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
+</head>
+<body>
+
+<div class="site">
+  <div class="title">
+    Tom Preston-Werner
+  </div>
+  
+  <h1>Foo Bar</h1>
+<p>Best <strong>post</strong> ever</p>
+</div>
+
+</body>
+</html>

data/test/dest/_posts/2008-11-21-complex.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+   <title>Complex</title>
+   <meta name="author" content="<%= @page.author %>" />
+
+   <!-- CodeRay syntax highlighting CSS -->
+   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
+
+   <!-- Homepage CSS -->
+   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
+</head>
+<body>
+
+<div class="site">
+  <div class="title">
+    Tom Preston-Werner
+  </div>
+  
+  <p>url: <br />
+date: <br />
+id:</p>
+</div>
+
+</body>
+</html>