jekyll 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.6 / 2008-12-13
+  * Major Features
+    * Include files in _includes with {% include x.textile %}
+
 == 0.1.5 / 2008-12-12
   * Major Features
     * Code highlighting with Pygments if --pygments is specified

data/Manifest.txt

@@ -6,7 +6,6 @@ bin/jekyll
 jekyll.gemspec
 lib/jekyll.rb
 lib/jekyll/albino.rb
-lib/jekyll/blocks.rb
 lib/jekyll/converters/csv.rb
 lib/jekyll/converters/mephisto.rb
 lib/jekyll/convertible.rb
@@ -15,11 +14,15 @@ 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.textile
 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.textile
 test/source/css/screen.css
 test/source/index.html
 test/source/posts/2008-12-03-permalinked-post.textile

data/README.textile

@@ -60,6 +60,43 @@ And if you don't want to be in the proto site root to run Jekyll:
   
 The autobuild feature can be used on any of the invocations.
 
+h2. Filters, Tags, and Blocks
+
+h3. Include Tag
+
+If you have small page fragments that you wish to include in multiple places on your site, you can use the <code>include</code> tag.
+
+<pre>{% include sig.textile %}</pre>
+
+Jekyll expects all include files to be placed in an <code>_includes</code> directory at the root of your source dir. So this will embed the contents of <code>/path/to/proto/site/_includes/sig.textile</code> into the calling file.
+
+h3. Code Highlighting Block
+
+Jekyll has built in support for syntax highlighting of over "100
+languages":http://pygments.org/languages/ via "Pygments":http://pygments.org/.
+In order to take advantage of this you'll need to have Pygments installed (and
+the pygmentize binary must be in your path).
+
+To denote a code block that should be highlighted:
+
+<pre>
+{% highlight ruby %}
+def foo
+  puts 'foo'
+end
+{% endhighlight %}
+</pre>
+
+The argument to <code>highlight</code> is the language identifier. To find the
+appropriate identifier to use for your favorite language, look for the "short
+name" on the "Lexers":http://pygments.org/docs/lexers/ page.
+
+In order for the highlighting to show up, you'll need to include a
+highlighting stylesheet. For an example stylesheet you can look at
+"syntax.css":http://github.com/mojombo/tpw/tree/master/css/syntax.css. These
+are the same styles as used by GitHub and you are free to use them for your
+own site.
+
 h2. Contribute
 
 If you'd like to hack on Jekyll, grab the source from GitHub. To get

data/jekyll.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{jekyll}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2008-12-12}
+  s.date = %q{2008-12-13}
   s.default_executable = %q{jekyll}
   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/blocks.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", "test/helper.rb", "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/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/site.rb", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "test/helper.rb", "test/source/_includes/sig.textile", "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.textile", "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"]

data/lib/jekyll.rb

@@ -17,7 +17,6 @@ begin
 rescue LoadError
   puts "The rdiscount gem is required for markdown support!"
 end
-require 'classifier'
 require 'directory_watcher'
 
 # internal requires
@@ -27,20 +26,25 @@ require 'jekyll/layout'
 require 'jekyll/page'
 require 'jekyll/post'
 require 'jekyll/filters'
-require 'jekyll/blocks'
+require 'jekyll/tags/highlight'
+require 'jekyll/tags/include'
 require 'jekyll/albino'
 
 module Jekyll
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
   
   class << self
-    attr_accessor :lsi, :pygments
+    attr_accessor :source, :dest, :lsi, :pygments
   end
   
   Jekyll.lsi = false
   Jekyll.pygments = false
   
   def self.process(source, dest)
+    require 'classifier' if Jekyll.lsi
+    
+    Jekyll.source = source
+    Jekyll.dest = dest
     Jekyll::Site.new(source, dest).process
   end
 end

data/lib/jekyll/{blocks.rb → tags/highlight.rb}

@@ -1,6 +1,6 @@
 module Jekyll
   
-  class Highlight < Liquid::Block
+  class HighlightBlock < Liquid::Block
     include Liquid::StandardFilters
     
     def initialize(tag_name, lang, tokens)
@@ -34,4 +34,4 @@ module Jekyll
   
 end
 
-Liquid::Template.register_tag('highlight', Jekyll::Highlight)
+Liquid::Template.register_tag('highlight', Jekyll::HighlightBlock)

data/lib/jekyll/tags/include.rb

@@ -0,0 +1,16 @@
+module Jekyll
+  
+  class IncludeTag < Liquid::Tag
+    def initialize(tag_name, file, tokens)
+      super
+      @file = file.strip
+    end
+    
+    def render(context)
+      File.read(File.join(Jekyll.source, '_includes', @file))
+    end
+  end
+  
+end
+
+Liquid::Template.register_tag('include', Jekyll::IncludeTag)

data/test/source/_includes/sig.textile

@@ -0,0 +1,3 @@
+--
+Tom Preston-Werner
+github.com/mojombo

data/test/source/_posts/2008-12-13-include.textile

@@ -0,0 +1,6 @@
+---
+layout: default
+title: Include
+---
+
+{% include sig.textile %}

data/test/test_post.rb

@@ -83,4 +83,13 @@ class TestPost < Test::Unit::TestCase
     
     assert_equal "<<< <p>url: /2008/11/21/complex.html<br />\ndate: Fri Nov 21 00:00:00 -0800 2008<br />\nid: /2008/11/21/complex</p> >>>", p.output
   end
+  
+  def test_include
+    Jekyll.source = File.join(File.dirname(__FILE__), *%w[source])
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-13-include.textile")
+    layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
+    p.add_layout(layouts, {"site" => {"posts" => []}})
+    
+    assert_equal "<<< <p>&#8212;<br />\nTom Preston-Werner<br />\ngithub.com/mojombo</p> >>>", p.output
+  end
 end

data/test/test_site.rb

@@ -19,7 +19,7 @@ class TestSite < Test::Unit::TestCase
   def test_read_posts
     @s.read_posts
     
-    assert_equal 2, @s.posts.size
+    assert_equal 3, @s.posts.size
   end
   
   def test_write_posts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 -08:00
+date: 2008-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,6 @@ files:
 - jekyll.gemspec
 - lib/jekyll.rb
 - lib/jekyll/albino.rb
-- lib/jekyll/blocks.rb
 - lib/jekyll/converters/csv.rb
 - lib/jekyll/converters/mephisto.rb
 - lib/jekyll/convertible.rb
@@ -110,11 +109,15 @@ files:
 - 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.textile
 - 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.textile
 - test/source/css/screen.css
 - test/source/index.html
 - test/source/posts/2008-12-03-permalinked-post.textile