jekyll 0.6.2 → 0.7.0

data/History.txt

@@ -1,3 +1,10 @@
+== 0.7.0 / 2010-08-24
+  * Minor Enhancements
+    * Add support for rdiscount extensions (#173)
+  * Bug Fixes
+    * Highlight should not be able to render local files
+    * The site configuration may not always provide a 'time' setting (#184)
+
 == 0.6.2 / 2010-06-25
   * Bug Fixes
     * Fix Rakefile 'release' task (tag pushing was missing origin)

data/jekyll.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '0.6.2'
-  s.date              = '2010-06-25'
+  s.version           = '0.7.0'
+  s.date              = '2010-08-24'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -123,6 +123,7 @@ Gem::Specification.new do |s|
     test/test_page.rb
     test/test_pager.rb
     test/test_post.rb
+    test/test_rdiscount.rb
     test/test_site.rb
     test/test_tags.rb
   ]

data/lib/jekyll.rb

@@ -45,7 +45,7 @@ require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
 module Jekyll
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 
   # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML).
@@ -71,6 +71,9 @@ module Jekyll
       'png_engine' => 'blahtex',
       'png_dir'    => 'images/latex',
       'png_url'    => '/images/latex'
+    },
+    'rdiscount'    => {
+      'extensions' => []
     }
   }
 

data/lib/jekyll/albino.rb

@@ -54,7 +54,7 @@ class Albino
   end
 
   def initialize(target, lexer = :text, format = :html)
-    @target  = File.exists?(target) ? File.read(target) : target rescue target
+    @target  = target
     @options = { :l => lexer, :f => format, :O => 'encoding=utf-8' }
   end
 

data/lib/jekyll/converters/markdown.rb

@@ -13,6 +13,9 @@ module Jekyll
         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'
@@ -67,7 +70,7 @@ module Jekyll
       setup
       case @config['markdown']
         when 'rdiscount'
-          RDiscount.new(content).to_html
+          RDiscount.new(content, *@rdiscount_extensions).to_html
         when 'maruku'
           Maruku.new(content).to_html
       end

data/lib/jekyll/site.rb

@@ -28,7 +28,11 @@ module Jekyll
     end
 
     def reset
-      self.time            = Time.parse(self.config['time'].to_s) || Time.now
+      self.time            = if self.config['time']
+                               Time.parse(self.config['time'].to_s)
+                             else
+                               Time.now
+                             end
       self.layouts         = {}
       self.posts           = []
       self.pages           = []

data/test/test_rdiscount.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestRdiscount < Test::Unit::TestCase
+
+  context "rdiscount" do
+    setup do
+      config = {
+        'rdiscount' => { 'extensions' => ['smart'] },
+        'markdown' => 'rdiscount'
+      }
+      @markdown = MarkdownConverter.new config
+    end
+
+    should "pass rdiscount extensions" do
+      assert_equal "<p>&ldquo;smart&rdquo;</p>", @markdown.convert('"smart"').strip
+    end
+  end
+end

data/test/test_tags.rb

@@ -24,9 +24,7 @@ title: This is a test
 
 This document results in a markdown error with maruku
 
-{% highlight text %}
-#{code}
-{% endhighlight %}
+{% highlight text %}#{code}{% endhighlight %}
 CONTENT
     create_post(content, override)
   end
@@ -45,6 +43,16 @@ CONTENT
     end
   end
 
+  context "post content has highlight with file reference" do
+    setup do
+      fill_post("./jekyll.gemspec")
+    end
+
+    should "not embed the file" do
+      assert_match %{<pre><code class='text'>./jekyll.gemspec\n</code></pre>}, @result
+    end
+  end
+
   context "post content has highlight tag with UTF character" do
     setup do
       fill_post("Æ")

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -07:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -259,6 +259,7 @@ files:
 - test/test_page.rb
 - test/test_pager.rb
 - test/test_post.rb
+- test/test_rdiscount.rb
 - test/test_site.rb
 - test/test_tags.rb
 has_rdoc: true
@@ -303,5 +304,6 @@ test_files:
 - test/test_page.rb
 - test/test_pager.rb
 - test/test_post.rb
+- test/test_rdiscount.rb
 - test/test_site.rb
 - test/test_tags.rb