jekyll 0.12.1 → 1.0.0.beta1

data/lib/jekyll/static_file.rb

@@ -1,5 +1,4 @@
 module Jekyll
-
   class StaticFile
     # The cache of last modification times [path] -> mtime.
     @@mtimes = Hash.new
@@ -68,5 +67,4 @@ module Jekyll
       nil
     end
   end
-
 end

data/lib/jekyll/tags/gist.rb

@@ -0,0 +1,19 @@
+# Gist Liquid Tag
+#
+# Example:
+#    {% gist 1234567 %}
+
+module Jekyll
+  class GistTag < Liquid::Tag
+    def initialize(tag_name, gist, tokens)
+      super
+      @gist = gist.strip
+    end
+
+    def render(context)
+      "<script src=\"https://gist.github.com/#{@gist}.js\"> </script>"
+    end
+  end
+end
+
+Liquid::Template.register_tag('gist', Jekyll::GistTag)

data/lib/jekyll/tags/highlight.rb

@@ -1,82 +1,83 @@
 module Jekyll
+  module Tags
+    class HighlightBlock < Liquid::Block
+      include Liquid::StandardFilters
 
-  class HighlightBlock < Liquid::Block
-    include Liquid::StandardFilters
+      # The regular expression syntax checker. Start with the language specifier.
+      # Follow that by zero or more space separated options that take one of two
+      # forms:
+      #
+      # 1. name
+      # 2. name=value
+      SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=\w+)?)*)$/
 
-    # The regular expression syntax checker. Start with the language specifier.
-    # Follow that by zero or more space separated options that take one of two
-    # forms:
-    #
-    # 1. name
-    # 2. name=value
-    SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=\w+)?)*)$/
-
-    def initialize(tag_name, markup, tokens)
-      super
-      if markup.strip =~ SYNTAX
-        @lang = $1
-        if defined?($2) && $2 != ''
-          tmp_options = {}
-          $2.split.each do |opt|
-            key, value = opt.split('=')
-            if value.nil?
-              if key == 'linenos'
-                value = 'inline'
-              else
-                value = true
+      def initialize(tag_name, markup, tokens)
+        super
+        if markup.strip =~ SYNTAX
+          @lang = $1
+          @options = {}
+          if defined?($2) && $2 != ''
+            $2.split.each do |opt|
+              key, value = opt.split('=')
+              if value.nil?
+                if key == 'linenos'
+                  value = 'inline'
+                else
+                  value = true
+                end
               end
+              @options[key] = value
             end
-            tmp_options[key] = value
           end
-          tmp_options = tmp_options.to_a.sort.collect { |opt| opt.join('=') }
-          # additional options to pass to Albino
-          @options = { 'O' => tmp_options.join(',') }
         else
-          @options = {}
+          raise SyntaxError.new <<-eos
+Syntax Error in tag 'highlight' while parsing the following markup:
+
+  #{markup}
+
+Valid syntax: highlight <lang> [linenos]
+eos
         end
-      else
-        raise SyntaxError.new("Syntax Error in 'highlight' - Valid syntax: highlight <lang> [linenos]")
       end
-    end
 
-    def render(context)
-      if context.registers[:site].pygments
-        render_pygments(context, super)
-      else
-        render_codehighlighter(context, super)
+      def render(context)
+        if context.registers[:site].pygments
+          render_pygments(context, super)
+        else
+          render_codehighlighter(context, super)
+        end
       end
-    end
 
-    def render_pygments(context, code)
-      @options[:encoding] = 'utf-8'
+      def render_pygments(context, code)
+        @options[:encoding] = 'utf-8'
 
-      output = add_code_tags(
-        Pygments.highlight(code, :lexer => @lang, :options => @options),
-        @lang
-      )
+        output = add_code_tags(
+          Pygments.highlight(code, :lexer => @lang, :options => @options),
+          @lang
+        )
 
-      output = context["pygments_prefix"] + output if context["pygments_prefix"]
-      output = output + context["pygments_suffix"] if context["pygments_suffix"]
-      output
-    end
+        output = context["pygments_prefix"] + output if context["pygments_prefix"]
+        output = output + context["pygments_suffix"] if context["pygments_suffix"]
+        output
+      end
 
-    def render_codehighlighter(context, code)
-      #The div is required because RDiscount blows ass
-      <<-HTML
-<div>
-  <pre><code class='#{@lang}'>#{h(code).strip}</code></pre>
-</div>
-      HTML
-    end
+      def render_codehighlighter(context, code)
+        #The div is required because RDiscount blows ass
+        <<-HTML
+  <div>
+    <pre><code class='#{@lang}'>#{h(code).strip}</code></pre>
+  </div>
+        HTML
+      end
 
-    def add_code_tags(code, lang)
-      # Add nested <code> tags to code blocks
-      code = code.sub(/<pre>/,'<pre><code class="' + lang + '">')
-      code = code.sub(/<\/pre>/,"</code></pre>")
-    end
+      def add_code_tags(code, lang)
+        # Add nested <code> tags to code blocks
+        code = code.sub(/<pre>/,'<pre><code class="' + lang + '">')
+        code = code.sub(/<\/pre>/,"</code></pre>")
+      end
 
+    end
   end
-
 end
 
-Liquid::Template.register_tag('highlight', Jekyll::HighlightBlock)
+Liquid::Template.register_tag('highlight', Jekyll::Tags::HighlightBlock)

data/lib/jekyll/tags/include.rb

@@ -1,37 +1,37 @@
 module Jekyll
+  module Tags
+    class IncludeTag < Liquid::Tag
+      def initialize(tag_name, file, tokens)
+        super
+        @file = file.strip
+      end
 
-  class IncludeTag < Liquid::Tag
-    def initialize(tag_name, file, tokens)
-      super
-      @file = file.strip
-    end
-
-    def render(context)
-      includes_dir = File.join(context.registers[:site].source, '_includes')
+      def render(context)
+        includes_dir = File.join(context.registers[:site].source, '_includes')
 
-      if File.symlink?(includes_dir)
-        return "Includes directory '#{includes_dir}' cannot be a symlink"
-      end
+        if File.symlink?(includes_dir)
+          return "Includes directory '#{includes_dir}' cannot be a symlink"
+        end
 
-      if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
-        return "Include file '#{@file}' contains invalid characters or sequences"
-      end
+        if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
+          return "Include file '#{@file}' contains invalid characters or sequences"
+        end
 
-      Dir.chdir(includes_dir) do
-        choices = Dir['**/*'].reject { |x| File.symlink?(x) }
-        if choices.include?(@file)
-          source = File.read(@file)
-          partial = Liquid::Template.parse(source)
-          context.stack do
-            partial.render(context)
+        Dir.chdir(includes_dir) do
+          choices = Dir['**/*'].reject { |x| File.symlink?(x) }
+          if choices.include?(@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
-        else
-          "Included file '#{@file}' not found in _includes directory"
         end
       end
     end
   end
-
 end
 
-Liquid::Template.register_tag('include', Jekyll::IncludeTag)
+Liquid::Template.register_tag('include', Jekyll::Tags::IncludeTag)

data/lib/jekyll/tags/post_url.rb

@@ -1,38 +1,43 @@
 module Jekyll
+  module Tags
+    class PostComparer
+      MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/
 
-  class PostComparer
-    MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/
+      attr_accessor :date, :slug
 
-    attr_accessor :date, :slug
-
-    def initialize(name)
-      who, cares, date, slug = *name.match(MATCHER)
-      @slug = slug
-      @date = Time.parse(date)
+      def initialize(name)
+        who, cares, date, slug = *name.match(MATCHER)
+        @slug = slug
+        @date = Time.parse(date)
+      end
     end
-  end
 
-  class PostUrl < Liquid::Tag
-    def initialize(tag_name, post, tokens)
-      super
-      @orig_post = post.strip
-      @post = PostComparer.new(@orig_post)
-    end
+    class PostUrl < Liquid::Tag
+      def initialize(tag_name, post, tokens)
+        super
+        @orig_post = post.strip
+        @post = PostComparer.new(@orig_post)
+      end
 
-    def render(context)
-      site = context.registers[:site]
-      
-      site.posts.each do |p|
-        if p == @post
-          return p.url
+      def render(context)
+        site = context.registers[:site]
+
+        site.posts.each do |p|
+          if p.slug == @post.slug \
+            and p.date.year == @post.date.year \
+            and p.date.month == @post.date.month \
+            and p.date.day == @post.date.day
+
+            return p.url
+          end
         end
-      end
 
-      puts "ERROR: post_url: \"#{@orig_post}\" could not be found"
+        puts "ERROR: post_url: \"#{@orig_post}\" could not be found"
 
-      return "#"
+        return "#"
+      end
     end
   end
 end
 
-Liquid::Template.register_tag('post_url', Jekyll::PostUrl)
+Liquid::Template.register_tag('post_url', Jekyll::Tags::PostUrl)

data/script/bootstrap

@@ -0,0 +1,2 @@
+#!/bin/sh
+bundle install

data/site/.gitignore

@@ -0,0 +1,4 @@
+_site/
+*.swp
+pkg/
+test/

data/site/CNAME

@@ -0,0 +1 @@
+jekyllrb.com

data/site/README

@@ -0,0 +1 @@
+Jekyll's awesome website.

data/site/_config.yml

@@ -0,0 +1,5 @@
+auto: false
+server: true
+permalink: /docs/:categories/:title
+pygments: true
+gauges_id: 503c5af6613f5d0f19000027

data/site/_includes/analytics.html

@@ -0,0 +1,32 @@
+{% if site.gauges_id %}
+  <!-- Gauges (http://gaug.es/) -->
+  <script type="text/javascript">
+    var _gauges = _gauges || [];
+    (function() {
+      var t   = document.createElement('script');
+      t.type  = 'text/javascript';
+      t.async = true;
+      t.id    = 'gauges-tracker';
+      t.setAttribute('data-site-id', '{{ site.gauges_id }}');
+      t.src = '//secure.gaug.es/track.js';
+      var s = document.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(t, s);
+    })();
+  </script>
+{% endif %}
+
+{% if site.google_analytics_id %}
+  <!-- Google Analytics (http://google.com/analytics) -->
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '{{ site.google_analytics_id }}']);
+    _gaq.push(['_setDomainName', '{{ site.url }}']); // Multiple sub-domains
+    _gaq.push(['_setAllowLinker', true]); // Multiple TLDs
+    _gaq.push(['_trackPageview']);
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+{% endif %}

data/site/_includes/docs_contents.html

@@ -0,0 +1,82 @@
+<div class="grid2">
+  <aside>
+    <h4>Getting Started</h4>
+    <ul>
+      <li class="{% if page.title == "Welcome" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/home">Welcome</a>
+      </li>
+      <li class="{% if page.title == "Installation" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/installation">Installation</a>
+      </li>
+      <li class="{% if page.title == "Basic Usage" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/usage">Basic Usage</a>
+      </li>
+      <li class="{% if page.title == "Directory structure" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/structure">Directory structure</a>
+      </li>
+      <li class="{% if page.title == "Configuration" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/configuration">Configuration</a>
+      </li>
+    </ul>
+    <h4>Your Content</h4>
+    <ul>
+      <li class="{% if page.title == "Front-matter" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/frontmatter">Front-matter</a>
+      </li>
+      <li class="{% if page.title == "Writing posts" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/posts">Writing posts</a>
+      </li>
+      <li class="{% if page.title == "Creating pages" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/pages">Creating pages</a>
+      </li>
+      <li class="{% if page.title == "Variables" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/variables">Variables</a>
+      </li>
+      <li class="{% if page.title == "Blog migrations" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/migrations">Blog migrations</a>
+      </li>
+    </ul>
+    <h4>Customization</h4>
+    <ul>
+      <li class="{% if page.title == "Templates" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/templates">Templates</a>
+      </li>
+      <li class="{% if page.title == "Permalinks" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/permalinks">Permalinks</a>
+      </li>
+      <li class="{% if page.title == "Pagination" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/pagination">Pagination</a>
+      </li>
+      <li class="{% if page.title == "Plugins" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/plugins">Plugins</a>
+      </li>
+      <li class="{% if page.title == "Extras" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/extras">Extras</a>
+      </li>
+    </ul>
+    <h4>Deployment</h4>
+    <ul>
+      <li class="{% if page.title == "GitHub Pages" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/github-pages">GitHub Pages</a>
+      </li>
+      <li class="{% if page.title == "Deployment methods" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/deployment-methods">Other methods</a>
+      </li>
+    </ul>
+    <h4>Miscellaneous</h4>
+    <ul>
+      <li class="{% if page.title == "Contributing" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/contributing">Contributing</a>
+      </li>
+      <li class="{% if page.title == "Troubleshooting" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/troubleshooting">Troubleshooting</a>
+      </li>
+      <li class="{% if page.title == "Sites using Jekyll" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/sites">Sites using Jekyll</a>
+      </li>
+      <li class="{% if page.title == "Resources" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/resources">Resources</a>
+      </li>
+    </ul>
+  </aside>
+</div>