jekyll-reloaded 0.12

data/jekyll.gemspec

@@ -0,0 +1,146 @@
+# encoding: utf-8
+Gem::Specification.new do |s|
+  s.name        = 'jekyll-reloaded'
+  s.version     = '0.12'
+
+  s.summary     = "Mislav's fork of Jekyll"
+  s.description = "Jekyll is a simple, blog aware, static site generator."
+
+  s.authors  = ["Tom Preston-Werner", "Mislav Marohnić"]
+  s.email    = 'mislav.marohnic@gmail.com'
+  s.homepage = 'https://github.com/mislav/jekyll/tree/reloaded'
+
+  # s.executables = ["jekyll"]
+
+  s.add_runtime_dependency('liquid', "~> 2.3")
+  s.add_runtime_dependency('classifier', "~> 1.3")
+  s.add_runtime_dependency('directory_watcher', "~> 1.1")
+  s.add_runtime_dependency('maruku', "~> 0.5")
+  s.add_runtime_dependency('kramdown', "~> 0.13")
+  s.add_runtime_dependency('pygments.rb', "~> 0.2.4")
+
+  s.add_development_dependency('rake', "~> 0.9")
+  s.add_development_dependency('rdoc', "~> 3.11")
+  s.add_development_dependency('redgreen', "~> 1.2")
+  s.add_development_dependency('shoulda', "~> 2.11")
+  s.add_development_dependency('rr', "~> 1.0")
+  s.add_development_dependency('cucumber', "1.1")
+  s.add_development_dependency('RedCloth', "~> 4.2")
+  s.add_development_dependency('rdiscount', "~> 1.6")
+  s.add_development_dependency('redcarpet', "~> 1.9")
+  
+  # = MANIFEST =
+  s.files = %w[
+    Gemfile
+    History.txt
+    LICENSE
+    README.textile
+    Rakefile
+    bin/jekyll
+    cucumber.yml
+    features/create_sites.feature
+    features/embed_filters.feature
+    features/markdown.feature
+    features/pagination.feature
+    features/permalinks.feature
+    features/post_data.feature
+    features/site_configuration.feature
+    features/site_data.feature
+    features/step_definitions/jekyll_steps.rb
+    features/support/env.rb
+    jekyll.gemspec
+    lib/guard/jekyll.rb
+    lib/jekyll.rb
+    lib/jekyll/converter.rb
+    lib/jekyll/converters/identity.rb
+    lib/jekyll/converters/markdown.rb
+    lib/jekyll/converters/textile.rb
+    lib/jekyll/convertible.rb
+    lib/jekyll/core_ext.rb
+    lib/jekyll/errors.rb
+    lib/jekyll/filters.rb
+    lib/jekyll/generator.rb
+    lib/jekyll/generators/pagination.rb
+    lib/jekyll/layout.rb
+    lib/jekyll/live_site.rb
+    lib/jekyll/migrators/csv.rb
+    lib/jekyll/migrators/drupal.rb
+    lib/jekyll/migrators/enki.rb
+    lib/jekyll/migrators/joomla.rb
+    lib/jekyll/migrators/marley.rb
+    lib/jekyll/migrators/mephisto.rb
+    lib/jekyll/migrators/mt.rb
+    lib/jekyll/migrators/posterous.rb
+    lib/jekyll/migrators/rss.rb
+    lib/jekyll/migrators/textpattern.rb
+    lib/jekyll/migrators/tumblr.rb
+    lib/jekyll/migrators/typo.rb
+    lib/jekyll/migrators/wordpress.rb
+    lib/jekyll/migrators/wordpressdotcom.rb
+    lib/jekyll/page.rb
+    lib/jekyll/plugin.rb
+    lib/jekyll/post.rb
+    lib/jekyll/site.rb
+    lib/jekyll/static_file.rb
+    lib/jekyll/tags/highlight.rb
+    lib/jekyll/tags/include.rb
+    lib/jekyll/tags/post_url.rb
+    test/helper.rb
+    test/source/.htaccess
+    test/source/_includes/sig.markdown
+    test/source/_layouts/default.html
+    test/source/_layouts/simple.html
+    test/source/_posts/2008-02-02-not-published.textile
+    test/source/_posts/2008-02-02-published.textile
+    test/source/_posts/2008-10-18-foo-bar.textile
+    test/source/_posts/2008-11-21-complex.textile
+    test/source/_posts/2008-12-03-permalinked-post.textile
+    test/source/_posts/2008-12-13-include.markdown
+    test/source/_posts/2009-01-27-array-categories.textile
+    test/source/_posts/2009-01-27-categories.textile
+    test/source/_posts/2009-01-27-category.textile
+    test/source/_posts/2009-01-27-empty-categories.textile
+    test/source/_posts/2009-01-27-empty-category.textile
+    test/source/_posts/2009-03-12-hash-#1.markdown
+    test/source/_posts/2009-05-18-empty-tag.textile
+    test/source/_posts/2009-05-18-empty-tags.textile
+    test/source/_posts/2009-05-18-tag.textile
+    test/source/_posts/2009-05-18-tags.textile
+    test/source/_posts/2009-06-22-empty-yaml.textile
+    test/source/_posts/2009-06-22-no-yaml.textile
+    test/source/_posts/2010-01-08-triple-dash.markdown
+    test/source/_posts/2010-01-09-date-override.textile
+    test/source/_posts/2010-01-09-time-override.textile
+    test/source/_posts/2010-01-09-timezone-override.textile
+    test/source/_posts/2010-01-16-override-data.textile
+    test/source/_posts/2011-04-12-md-extension.md
+    test/source/_posts/2011-04-12-text-extension.text
+    test/source/about.html
+    test/source/category/_posts/2008-9-23-categories.textile
+    test/source/contacts.html
+    test/source/css/screen.css
+    test/source/deal.with.dots.html
+    test/source/foo/_posts/bar/2008-12-12-topical-post.textile
+    test/source/index.html
+    test/source/sitemap.xml
+    test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
+    test/source/z_category/_posts/2008-9-23-categories.textile
+    test/suite.rb
+    test/test_configuration.rb
+    test/test_core_ext.rb
+    test/test_filters.rb
+    test/test_generated_site.rb
+    test/test_kramdown.rb
+    test/test_page.rb
+    test/test_pager.rb
+    test/test_post.rb
+    test/test_rdiscount.rb
+    test/test_redcarpet.rb
+    test/test_redcloth.rb
+    test/test_site.rb
+    test/test_tags.rb
+  ]
+  # = MANIFEST =
+
+  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
+end

data/lib/guard/jekyll.rb

@@ -0,0 +1,57 @@
+require 'guard/guard'
+require 'jekyll/live_site'
+
+class Guard::Jekyll < Guard::Guard
+  attr_reader :workdir
+
+  def initialize(watchers = [], options = {})
+    super
+    @site = nil
+    @workdir = Dir.pwd
+  end
+
+  def init_site
+    jekyll_options = ::Jekyll::configuration(@options)
+    @site = ::Jekyll::LiveSite.new(jekyll_options)
+    @destination = File.join(File.expand_path(jekyll_options['destination'], @workdir), '')
+    print "Rebuilding Jekyll site... "
+    @site.process
+    puts "done."
+  end
+  alias_method :start, :init_site
+  alias_method :reload, :init_site
+  alias_method :run_all, :init_site
+
+  def run_on_change paths
+    init_site if paths.include? '_config.yml'
+    return if @site.nil?
+    render_files paths
+  end
+
+  def filter_files paths
+    paths.reject { |path| in_destination? path }
+  end
+
+  def in_destination? path
+    File.expand_path(path, workdir).index(@destination) == 0
+  end
+
+  def render_files paths
+    changed = []
+    @site.process_files filter_files(paths) do |processed|
+      relative = processed.sub("#{workdir}/", '')
+      puts "Jekyll: #{relative}"
+      changed << relative
+    end
+
+    notify changed if changed.any?
+  end
+
+  def notify changed_files
+    ::Guard.guards.each do |guard|
+      next if self.class === guard
+      paths = ::Guard::Watcher.match_files(guard, changed_files)
+      guard.run_on_change(paths) unless paths.empty?
+    end
+  end
+end

data/lib/jekyll/converter.rb

@@ -0,0 +1,50 @@
+module Jekyll
+
+  class Converter < Plugin
+    # Public: Get or set the pygments prefix. When an argument is specified,
+    # the prefix will be set. If no argument is specified, the current prefix
+    # will be returned.
+    #
+    # pygments_prefix - The String prefix (default: nil).
+    #
+    # Returns the String prefix.
+    def self.pygments_prefix(pygments_prefix = nil)
+      @pygments_prefix = pygments_prefix if pygments_prefix
+      @pygments_prefix
+    end
+
+    # Public: Get or set the pygments suffix. When an argument is specified,
+    # the suffix will be set. If no argument is specified, the current suffix
+    # will be returned.
+    #
+    # pygments_suffix - The String suffix (default: nil).
+    #
+    # Returns the String suffix.
+    def self.pygments_suffix(pygments_suffix = nil)
+      @pygments_suffix = pygments_suffix if pygments_suffix
+      @pygments_suffix
+    end
+
+    # Initialize the converter.
+    #
+    # Returns an initialized Converter.
+    def initialize(config = {})
+      @config = config
+    end
+
+    # Get the pygments prefix.
+    #
+    # Returns the String prefix.
+    def pygments_prefix
+      self.class.pygments_prefix
+    end
+
+    # Get the pygments suffix.
+    #
+    # Returns the String suffix.
+    def pygments_suffix
+      self.class.pygments_suffix
+    end
+  end
+
+end

data/lib/jekyll/converters/identity.rb

@@ -0,0 +1,22 @@
+module Jekyll
+
+  class IdentityConverter < Converter
+    safe true
+
+    priority :lowest
+
+    def matches(ext)
+      true
+    end
+
+    def output_ext(ext)
+      ext
+    end
+
+    def convert(content)
+      content
+    end
+
+  end
+
+end

data/lib/jekyll/converters/markdown.rb

@@ -0,0 +1,125 @@
+module Jekyll
+
+  class MarkdownConverter < Converter
+    safe true
+
+    pygments_prefix "\n"
+    pygments_suffix "\n"
+
+    def setup
+      return if @setup
+      # Set the Markdown interpreter (and Maruku self.config, if necessary)
+      case @config['markdown']
+        when 'redcarpet'
+          begin
+            require 'redcarpet'
+            @redcarpet_extensions = @config['redcarpet']['extensions'].map { |e| e.to_sym }
+          rescue LoadError
+            STDERR.puts 'You are missing a library required for Markdown. Please run:'
+            STDERR.puts '  $ [sudo] gem install redcarpet'
+            raise FatalException.new("Missing dependency: redcarpet")
+          end
+        when 'kramdown'
+          begin
+            require 'kramdown'
+          rescue LoadError
+            STDERR.puts 'You are missing a library required for Markdown. Please run:'
+            STDERR.puts '  $ [sudo] gem install kramdown'
+            raise FatalException.new("Missing dependency: kramdown")
+          end
+        when 'rdiscount'
+          begin
+            require 'rdiscount'
+
+            # Load rdiscount extensions
+            @rdiscount_extensions = @config['rdiscount']['extensions'].map { |e| e.to_sym }
+          rescue LoadError
+            STDERR.puts 'You are missing a library required for Markdown. Please run:'
+            STDERR.puts '  $ [sudo] gem install rdiscount'
+            raise FatalException.new("Missing dependency: rdiscount")
+          end
+        when 'maruku'
+          begin
+            require 'maruku'
+
+            if @config['maruku']['use_divs']
+              require 'maruku/ext/div'
+              STDERR.puts 'Maruku: Using extended syntax for div elements.'
+            end
+
+            if @config['maruku']['use_tex']
+              require 'maruku/ext/math'
+              STDERR.puts "Maruku: Using LaTeX extension. Images in `#{@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] =  @config['maruku']['png_engine']
+              MaRuKu::Globals[:html_png_dir] = @config['maruku']['png_dir']
+              MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url']
+            end
+          rescue LoadError
+            STDERR.puts 'You are missing a library required for Markdown. Please run:'
+            STDERR.puts '  $ [sudo] gem install maruku'
+            raise FatalException.new("Missing dependency: maruku")
+          end
+        else
+          STDERR.puts "Invalid Markdown processor: #{@config['markdown']}"
+          STDERR.puts "  Valid options are [ maruku | rdiscount | kramdown ]"
+          raise FatalException.new("Invalid Markdown process: #{@config['markdown']}")
+      end
+      @setup = true
+    end
+    
+    def matches(ext)
+      rgx = '(' + @config['markdown_ext'].gsub(',','|') +')'
+      ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
+    end
+
+    def output_ext(ext)
+      ".html"
+    end
+
+    def convert(content)
+      setup
+      case @config['markdown']
+        when 'redcarpet'
+          Redcarpet.new(content, *@redcarpet_extensions).to_html
+        when 'kramdown'
+          # Check for use of coderay
+          if @config['kramdown']['use_coderay']
+            Kramdown::Document.new(content, {
+              :auto_ids      => @config['kramdown']['auto_ids'],
+              :footnote_nr   => @config['kramdown']['footnote_nr'],
+              :entity_output => @config['kramdown']['entity_output'],
+              :toc_levels    => @config['kramdown']['toc_levels'],
+
+              :coderay_wrap               => @config['kramdown']['coderay']['coderay_wrap'],
+              :coderay_line_numbers       => @config['kramdown']['coderay']['coderay_line_numbers'],
+              :coderay_line_number_start  => @config['kramdown']['coderay']['coderay_line_number_start'],
+              :coderay_tab_width          => @config['kramdown']['coderay']['coderay_tab_width'],
+              :coderay_bold_every         => @config['kramdown']['coderay']['coderay_bold_every'],
+              :coderay_css                => @config['kramdown']['coderay']['coderay_css']
+            }).to_html
+          else
+            # not using coderay
+            Kramdown::Document.new(content, {
+              :auto_ids      => @config['kramdown']['auto_ids'],
+              :footnote_nr   => @config['kramdown']['footnote_nr'],
+              :entity_output => @config['kramdown']['entity_output'],
+              :toc_levels    => @config['kramdown']['toc_levels']
+            }).to_html
+          end
+        when 'rdiscount'
+          RDiscount.new(content, *@rdiscount_extensions).to_html
+        when 'maruku'
+          Maruku.new(content).to_html
+      end
+    end
+  end
+
+end

data/lib/jekyll/converters/textile.rb

@@ -0,0 +1,50 @@
+module Jekyll
+
+  class TextileConverter < Converter
+    safe true
+
+    pygments_prefix '<notextile>'
+    pygments_suffix '</notextile>'
+
+    def setup
+      return if @setup
+      require 'redcloth'
+      @setup = true
+    rescue LoadError
+      STDERR.puts 'You are missing a library required for Textile. Please run:'
+      STDERR.puts '  $ [sudo] gem install RedCloth'
+      raise FatalException.new("Missing dependency: RedCloth")
+    end
+
+    def matches(ext)
+      rgx = '(' + @config['textile_ext'].gsub(',','|') +')'
+      ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
+    end
+
+    def output_ext(ext)
+      ".html"
+    end
+
+    def convert(content)
+      setup
+
+      # Shortcut if config doesn't contain RedCloth section
+      return RedCloth.new(content).to_html if @config['redcloth'].nil?
+
+      # List of attributes defined on RedCloth
+      # (from http://redcloth.rubyforge.org/classes/RedCloth/TextileDoc.html)
+      attrs = ['filter_classes', 'filter_html', 'filter_ids', 'filter_styles',
+              'hard_breaks', 'lite_mode', 'no_span_caps', 'sanitize_html']
+
+      r = RedCloth.new(content)
+
+      # Set attributes in r if they are NOT nil in the config
+      attrs.each do |attr|
+        r.instance_variable_set("@#{attr}".to_sym, @config['redcloth'][attr]) unless @config['redcloth'][attr].nil?
+      end
+
+      r.to_html
+    end
+  end
+
+end

data/lib/jekyll/convertible.rb

@@ -0,0 +1,116 @@
+require 'set'
+
+# Convertible provides methods for converting a pagelike item
+# from a certain type of markup into actual content
+#
+# Requires
+#   self.site -> Jekyll::Site
+#   self.content
+#   self.content=
+#   self.data
+#   self.data=
+#   self.ext
+#   self.output
+#   self.output=
+#   self.name
+module Jekyll
+  module Convertible
+    # Returns the contents as a String.
+    def to_s
+      self.content || ''
+    end
+
+    # Read the YAML frontmatter.
+    #
+    # base - The String path to the dir containing the file.
+    # name - The String filename of the file.
+    #
+    # Returns nothing.
+    def read_yaml(base, name)
+      self.content = File.read(File.join(base, name))
+
+      if self.content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+        self.content = $POSTMATCH
+        data = begin
+          YAML.load($1)
+        rescue => e
+          puts "YAML Exception reading #{name}: #{e.message}"
+          nil
+        end
+        self.data = data
+      end
+
+      self.data ||= {}
+    end
+
+    # Transform the contents based on the content type.
+    #
+    # Returns nothing.
+    def transform
+      self.content = converter.convert(self.content)
+    end
+
+    # Determine the extension depending on content_type.
+    #
+    # Returns the String extension for the output file.
+    #   e.g. ".html" for an HTML output file.
+    def output_ext
+      converter.output_ext(self.ext)
+    end
+
+    # Determine which converter to use based on this convertible's
+    # extension.
+    #
+    # Returns the Converter instance.
+    def converter
+      @converter ||= self.site.converters.find { |c| c.matches(self.ext) }
+    end
+
+    # Add any necessary layouts to this convertible document.
+    #
+    # payload - The site payload Hash.
+    # layouts - A Hash of {"name" => "layout"}.
+    #
+    # Returns nothing.
+    def do_layout(payload, layouts)
+      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site } }
+
+      # render and transform content (this becomes the final content of the object)
+      payload["pygments_prefix"] = converter.pygments_prefix
+      payload["pygments_suffix"] = converter.pygments_suffix
+
+      begin
+        self.content = Liquid::Template.parse(self.content).render(payload, info)
+      rescue => e
+        puts "Liquid Exception: #{e.message} in #{self.name}"
+      end
+
+      self.transform
+
+      # output keeps track of what will finally be written
+      self.output = self.content
+
+      # recursively render layouts
+      layout = layouts[self.data["layout"]]
+      used = Set.new([layout])
+
+      while layout
+        payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
+
+        begin
+          self.output = Liquid::Template.parse(layout.content).render(payload, info)
+        rescue => e
+          puts "Liquid Exception: #{e.message} in #{self.data["layout"]}"
+        end
+
+        if layout = layouts[layout.data["layout"]]
+          if used.include?(layout)
+            layout = nil # avoid recursive chain
+          else
+            used << layout
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/core_ext.rb

@@ -0,0 +1,52 @@
+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
+
+  # Read array from the supplied hash favouring the singular key
+  # and then the plural key, and handling any nil entries.
+  #   +hash+ the hash to read from
+  #   +singular_key+ the singular key
+  #   +plural_key+ the singular key
+  #
+  # Returns an array
+  def pluralized_array(singular_key, plural_key)
+    hash = self
+    if hash.has_key?(singular_key)
+      array = [hash[singular_key]] if hash[singular_key]
+    elsif hash.has_key?(plural_key)
+      case hash[plural_key]
+      when String
+        array = hash[plural_key].split
+      when Array
+        array = hash[plural_key].compact
+      end
+    end
+    array || []
+  end
+end
+
+# Thanks, ActiveSupport!
+class Date
+  # Converts datetime to an appropriate format for use in XML
+  def xmlschema
+    strftime("%Y-%m-%dT%H:%M:%S%Z")
+  end if RUBY_VERSION < '1.9'
+end

data/lib/jekyll/errors.rb

@@ -0,0 +1,6 @@
+module Jekyll
+
+  class FatalException < StandardError
+  end
+
+end