sixones-jekyll 0.4.1 → 0.5.0

data/lib/jekyll/core_ext.rb

@@ -1,22 +1,22 @@
 class Hash
   # Merges self with another hash, recursively.
-  # 
+  #
   # This code was lovingly stolen from some random gem:
   # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
-  # 
+  #
   # Thanks to whoever made it.
   def deep_merge(hash)
     target = dup
-    
+
     hash.keys.each do |key|
       if hash[key].is_a? Hash and self[key].is_a? Hash
         target[key] = target[key].deep_merge(hash[key])
         next
       end
-      
+
       target[key] = hash[key]
     end
-    
+
     target
   end
 end

data/lib/jekyll/filters.rb

@@ -1,9 +1,10 @@
 module Jekyll
-  module Filters    
+
+  module Filters
     def textilize(input)
       RedCloth.new(input).to_html
     end
-  
+
     def date_to_string(date)
       date.strftime("%d %b %Y")
     end
@@ -11,19 +12,19 @@ module Jekyll
     def date_to_long_string(date)
       date.strftime("%d %B %Y")
     end
-  
+
     def date_to_xmlschema(date)
       date.xmlschema
     end
-  
+
     def xml_escape(input)
       input.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
     end
-  
+
     def number_of_words(input)
       input.split.length
     end
-  
+
     def array_to_sentence_string(array)
       connector = "and"
       case array.length
@@ -37,5 +38,6 @@ module Jekyll
         "#{array[0...-1].join(', ')}, #{connector} #{array[-1]}"
       end
     end
-  end  
+
+  end
 end

data/lib/jekyll/layout.rb

@@ -2,25 +2,28 @@ module Jekyll
 
   class Layout
     include Convertible
-    
+
+    attr_accessor :site
     attr_accessor :ext
     attr_accessor :data, :content
-    
+
     # Initialize a new Layout.
+    #   +site+ is the Site
     #   +base+ is the String path to the <source>
     #   +name+ is the String filename of the post file
     #
     # Returns <Page>
-    def initialize(base, name)
+    def initialize(site, base, name)
+      @site = site
       @base = base
       @name = name
-      
+
       self.data = {}
-      
+
       self.process(name)
       self.read_yaml(base, name)
     end
-    
+
     # Extract information from the layout filename
     #   +name+ is the String filename of the layout file
     #

data/lib/jekyll/page.rb

@@ -2,28 +2,31 @@ module Jekyll
 
   class Page
     include Convertible
-    
+
+    attr_accessor :site
     attr_accessor :ext
     attr_accessor :data, :content, :output
-    
+
     # Initialize a new Page.
+    #   +site+ is the Site
     #   +base+ is the String path to the <source>
     #   +dir+ is the String path between <source> and the file
     #   +name+ is the String filename of the file
     #
     # Returns <Page>
-    def initialize(base, dir, name)
+    def initialize(site, base, dir, name)
+      @site = site
       @base = base
       @dir = dir
       @name = name
-      
+
       self.data = {}
-      
+
       self.process(name)
       self.read_yaml(File.join(base, dir), name)
       #self.transform
     end
-    
+
     # Extract information from the page filename
     #   +name+ is the String filename of the page file
     #
@@ -31,7 +34,7 @@ module Jekyll
     def process(name)
       self.ext = File.extname(name)
     end
-    
+
     # Add any necessary layouts to this post
     #   +layouts+ is a Hash of {"name" => "layout"}
     #   +site_payload+ is the site payload hash
@@ -41,19 +44,19 @@ module Jekyll
       payload = {"page" => self.data}.deep_merge(site_payload)
       do_layout(payload, layouts)
     end
-    
+
     # Write the generated page file to the destination directory.
     #   +dest+ is the String path to the destination dir
     #
     # Returns nothing
     def write(dest)
       FileUtils.mkdir_p(File.join(dest, @dir))
-      
+
       name = @name
       if self.ext != ""
         name = @name.split(".")[0..-2].join('.') + self.ext
       end
-      
+
       path = File.join(dest, @dir, name)
       File.open(path, 'w') do |f|
         f.write(self.output)

data/lib/jekyll/post.rb

@@ -3,13 +3,13 @@ module Jekyll
   class Post
     include Comparable
     include Convertible
-        
+
     class << self
       attr_accessor :lsi
     end
-    
+
     MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
-    
+
     # Post name validator. Post filenames must be like:
     #   2008-11-05-my-awesome-post.textile
     #
@@ -17,34 +17,37 @@ module Jekyll
     def self.valid?(name)
       name =~ MATCHER
     end
-    
+
+    attr_accessor :site
     attr_accessor :date, :slug, :ext, :categories, :topics, :published
     attr_accessor :data, :content, :output
-    
+
     # Initialize this Post instance.
+    #   +site+ is the Site
     #   +base+ is the String path to the dir containing the post file
     #   +name+ is the String filename of the post file
     #   +categories+ is an Array of Strings for the categories for this post
     #
     # Returns <Post>
-    def initialize(source, dir, name)
+    def initialize(site, source, dir, name)
+      @site = site
       @base = File.join(source, dir, '_posts')
       @name = name
-      
+
       self.categories = dir.split('/').reject { |x| x.empty? }
-      
+
       parts = name.split('/')
       self.topics = parts.size > 1 ? parts[0..-2] : []
-      
+
       self.process(name)
       self.read_yaml(@base, name)
 
-			if self.data.has_key?('published') && self.data['published'] == false
-				self.published = false
-			else
-				self.published = true
-			end
-      
+      if self.data.has_key?('published') && self.data['published'] == false
+        self.published = false
+      else
+        self.published = true
+      end
+
       if self.categories.empty?
         if self.data.has_key?('category')
           self.categories << self.data['category']
@@ -59,14 +62,14 @@ module Jekyll
         end
       end
     end
-    
+
     # Spaceship is based on Post#date
     #
     # Returns -1, 0, 1
     def <=>(other)
       self.date <=> other.date
     end
-    
+
     # Extract information from the post filename
     #   +name+ is the String filename of the post file
     #
@@ -77,7 +80,7 @@ module Jekyll
       self.slug = slug
       self.ext = ext
     end
-    
+
     # 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
@@ -89,14 +92,14 @@ module Jekyll
         permalink.to_s.split("/")[0..-2].join("/") + '/'
       else
         prefix = self.categories.empty? ? '' : '/' + self.categories.join('/')
-        if [:date, :pretty].include?(Jekyll.permalink_style)
+        if [:date, :pretty].include?(self.site.permalink_style)
           prefix + date.strftime("/%Y/%m/%d/")
         else
           prefix + '/'
         end
       end
     end
-    
+
     # The full path and filename of the post.
     # Defined in the YAML of the post body
     # (Optional)
@@ -105,16 +108,16 @@ module Jekyll
     def permalink
       self.data && self.data['permalink']
     end
-    
+
     # The generated relative url of this post
     # e.g. /2008/11/05/my-awesome-post.html
     #
     # Returns <String>
     def url
-      ext = Jekyll.permalink_style == :pretty ? '' : '.html'
+      ext = self.site.permalink_style == :pretty ? '' : '.html'
       permalink || self.id + ext
     end
-    
+
     # The UID for this post (useful in feeds)
     # e.g. /2008/11/05/my-awesome-post
     #
@@ -122,14 +125,14 @@ module Jekyll
     def id
       self.dir + self.slug
     end
-    
+
     # Calculate related posts.
     #
     # Returns [<Post>]
     def related_posts(posts)
       return [] unless posts.size > 1
-      
-      if Jekyll.lsi
+
+      if self.site.lsi
         self.class.lsi ||= begin
           puts "Running the classifier... this could take a while."
           lsi = Classifier::LSI.new
@@ -144,7 +147,7 @@ module Jekyll
         (posts - [self])[0..9]
       end
     end
-    
+
     # Add any necessary layouts to this post
     #   +layouts+ is a Hash of {"name" => "layout"}
     #   +site_payload+ is the site payload hash
@@ -158,20 +161,20 @@ module Jekyll
         "page" => self.to_liquid
       }
       payload = payload.deep_merge(site_payload)
-      
+
       do_layout(payload, layouts)
     end
-    
+
     # Write the generated post file to the destination directory.
     #   +dest+ is the String path to the destination dir
     #
     # Returns nothing
     def write(dest)
       FileUtils.mkdir_p(File.join(dest, dir))
-      
+
       path = File.join(dest, self.url)
 
-      if Jekyll.permalink_style == :pretty
+      if self.site.permalink_style == :pretty
         FileUtils.mkdir_p(path)
         path = File.join(path, "index.html")
       end
@@ -180,7 +183,7 @@ module Jekyll
         f.write(self.output)
       end
     end
-    
+
     # Convert this post into a Hash for use in Liquid templates.
     #
     # Returns <Hash>
@@ -190,9 +193,10 @@ module Jekyll
         "date" => self.date,
         "id" => self.id,
         "topics" => self.topics,
+        "categories" => self.categories,
         "content" => self.content }.deep_merge(self.data)
     end
-    
+
     def inspect
       "<Post: #{self.id}>"
     end

data/lib/jekyll/site.rb

@@ -1,50 +1,102 @@
 module Jekyll
-  
+
   class Site
-    attr_accessor :source, :dest
-    attr_accessor :layouts, :posts, :categories
-    
+    attr_accessor :config, :layouts, :posts, :categories
+    attr_accessor :source, :dest, :lsi, :pygments, :permalink_style
+
     # Initialize the site
-    #   +source+ is String path to the source directory containing
-    #            the proto-site
-    #   +dest+ is the String path to the directory where the generated
-    #          site should be written
+    #   +config+ is a Hash containing site configurations details
     #
     # Returns <Site>
-    def initialize(source, dest)
-      self.source = source
-      self.dest = dest
-      self.layouts = {}
-      self.posts = []
-      self.categories = Hash.new { |hash, key| hash[key] = Array.new }
+    def initialize(config)
+      self.config          = config.clone
+
+      self.source          = config['source']
+      self.dest            = config['destination']
+      self.lsi             = config['lsi']
+      self.pygments        = config['pygments']
+      self.permalink_style = config['permalink'].to_sym
+
+      self.reset
+      self.setup
     end
-    
+
+    def reset
+      self.layouts         = {}
+      self.posts           = []
+      self.categories      = Hash.new { |hash, key| hash[key] = Array.new }
+    end
+
+    def setup
+      # Check to see if LSI is enabled.
+      require 'classifier' if self.lsi
+
+      # Set the Markdown interpreter (and Maruku self.config, if necessary)
+      case self.config['markdown']
+        when 'rdiscount'
+          begin
+            require 'rdiscount'
+
+            def markdown(content)
+              RDiscount.new(content).to_html
+            end
+
+            puts 'Using rdiscount for Markdown'
+          rescue LoadError
+            puts 'You must have the rdiscount gem installed first'
+          end
+        when 'maruku'
+          begin
+            require 'maruku'
+
+            def markdown(content)
+              Maruku.new(content).to_html
+            end
+
+            if self.config['maruku']['use_divs']
+              require 'maruku/ext/div'
+              puts 'Maruku: Using extended syntax for div elements.'
+            end
+
+            if self.config['maruku']['use_tex']
+              require 'maruku/ext/math'
+              puts "Maruku: Using LaTeX extension. Images in `#{self.config['maruku']['png_dir']}`."
+
+              # Switch off MathML output
+              MaRuKu::Globals[:html_math_output_mathml] = false
+              MaRuKu::Globals[:html_math_engine] = 'none'
+
+              # Turn on math to PNG support with blahtex
+              # Resulting PNGs stored in `images/latex`
+              MaRuKu::Globals[:html_math_output_png] = true
+              MaRuKu::Globals[:html_png_engine] =  self.config['maruku']['png_engine']
+              MaRuKu::Globals[:html_png_dir] = self.config['maruku']['png_dir']
+              MaRuKu::Globals[:html_png_url] = self.config['maruku']['png_url']
+            end
+          rescue LoadError
+            puts "The maruku gem is required for markdown support!"
+          end
+      end
+      
+      if self.config['custom_filters']
+        self.read_filters
+      end
+    end
+
+    def textile(content)
+      RedCloth.new(content).to_html
+    end
+
     # Do the actual work of processing the site and generating the
     # real deal.
     #
     # Returns nothing
     def process
-      self.read_filters
+      self.reset
       self.read_layouts
       self.transform_pages
       self.write_posts
     end
-    
-    def read_filters
-      if Jekyll.custom_filters
-        base = File.join(self.source, "_filters")
-        
-        if File.exists?(base)
-          entries = [ ]
-      
-          Dir.chdir(base) { entries = filter_entries(Dir['*.rb*']) }
-      
-          entries.each do |f|
-            require File.join(base, f)
-          end
-        end
-      end
-    end
 
     # Read all the files in <source>/_layouts into memory for later use.
     #
@@ -53,15 +105,25 @@ module Jekyll
       base = File.join(self.source, "_layouts")
       entries = []
       Dir.chdir(base) { entries = filter_entries(Dir['*.*']) }
-      
+
       entries.each do |f|
         name = f.split(".")[0..-2].join(".")
-        self.layouts[name] = Layout.new(base, f)
+        self.layouts[name] = Layout.new(self, base, f)
       end
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
     
+    def read_filters
+      base = File.join(self.source, '_filters')
+      entries = []
+      Dir.chdir(base) { entries = filter_entries(Dir['*.rb']) }
+      
+      entries.each do |f|
+        require File.join(base, f)
+      end
+    end
+
     # Read all the files in <base>/_posts and create a new Post object with each one.
     #
     # Returns nothing
@@ -73,7 +135,7 @@ module Jekyll
       # first pass processes, but does not yet render post content
       entries.each do |f|
         if Post.valid?(f)
-          post = Post.new(self.source, dir, f)
+          post = Post.new(self, self.source, dir, f)
 
           if post.published
             self.posts << post
@@ -81,18 +143,18 @@ module Jekyll
           end
         end
       end
-      
+
       # second pass renders each post now that full site payload is available
       self.posts.each do |post|
         post.render(self.layouts, site_payload)
       end
-      
+
       self.posts.sort!
       self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
-    
+
     # Write each post to <dest>/<year>/<month>/<day>/<slug>
     #
     # Returns nothing
@@ -101,7 +163,7 @@ module Jekyll
         post.write(self.dest)
       end
     end
-    
+
     # Copy all regular files from <source> to <dest>/ ignoring
     # any files/directories that are hidden or backup files (start
     # with "." or "#" or end with "~") or contain site content (start with "_")
@@ -117,7 +179,7 @@ module Jekyll
       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 
+      # we need to make sure to process _posts *first* otherwise they
       # might not be available yet to other templates as {{ site.posts }}
       if directories.include?('_posts')
         directories.delete('_posts')
@@ -130,10 +192,10 @@ module Jekyll
             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 = Page.new(self, self.source, dir, f)
               page.render(self.layouts, site_payload)
               page.write(self.dest)
             else
@@ -166,7 +228,7 @@ module Jekyll
     #                     "topics" => [<Post>] }}
     def site_payload
       {"site" => {
-        "time" => Time.now, 
+        "time" => Time.now,
         "posts" => self.posts.sort { |a,b| b <=> a },
         "categories" => post_attr_hash('categories'),
         "topics" => post_attr_hash('topics')

data/lib/jekyll/tags/highlight.rb

@@ -1,10 +1,11 @@
 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, markup, tokens)
       super
       if markup =~ SYNTAX
@@ -19,23 +20,25 @@ module Jekyll
         raise SyntaxError.new("Syntax Error in 'highlight' - Valid syntax: highlight <lang> [linenos]")
       end
     end
-  
+
     def render(context)
-      if Jekyll.pygments
+      if context.registers[:site].pygments
         render_pygments(context, super.to_s)
       else
         render_codehighlighter(context, super.to_s)
       end
     end
-    
+
     def render_pygments(context, code)
-      if Jekyll.content_type == :markdown
+      if context["content_type"] == :markdown
         return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
+      elsif context["content_type"] == :textile
+        return "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
       else
-        "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
+        return Albino.new(code, @lang).to_s(@options)
       end
     end
-    
+
     def render_codehighlighter(context, code)
     #The div is required because RDiscount blows ass
       <<-HTML
@@ -47,7 +50,7 @@ module Jekyll
       HTML
     end
   end
-  
+
 end
 
 Liquid::Template.register_tag('highlight', Jekyll::HighlightBlock)

data/lib/jekyll/tags/include.rb

@@ -1,17 +1,17 @@
 module Jekyll
-  
+
   class IncludeTag < Liquid::Tag
     def initialize(tag_name, file, tokens)
       super
       @file = file.strip
     end
-    
+
     def render(context)
       if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
         return "Include file '#{@file}' contains invalid characters or sequences"
       end
-      
-      Dir.chdir(File.join(Jekyll.source, '_includes')) do
+
+      Dir.chdir(File.join(context.registers[:site].source, '_includes')) do
         choices = Dir['**/*'].reject { |x| File.symlink?(x) }
         if choices.include?(@file)
           source = File.read(@file)
@@ -25,7 +25,7 @@ module Jekyll
       end
     end
   end
-  
+
 end
 
 Liquid::Template.register_tag('include', Jekyll::IncludeTag)