jekyll 0.10.0 → 0.11.0

data/lib/jekyll/static_file.rb

@@ -1,15 +1,15 @@
 module Jekyll
 
   class StaticFile
-    @@mtimes = Hash.new # the cache of last modification times [path] -> mtime
+    # The cache of last modification times [path] -> mtime.
+    @@mtimes = Hash.new
 
     # Initialize a new StaticFile.
-    #   +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 <StaticFile>
+    # site - The Site.
+    # base - The String path to the <source>.
+    # dir  - The String path between <source> and the file.
+    # name - The String filename of the file.
     def initialize(site, base, dir, name)
       @site = site
       @base = base
@@ -17,24 +17,21 @@ module Jekyll
       @name = name
     end
 
-    # Obtains source file path.
-    #
     # Returns source file path.
     def path
       File.join(@base, @dir, @name)
     end
 
     # Obtain destination path.
-    #   +dest+ is the String path to the destination dir
+    #
+    # dest - The String path to the destination dir.
     #
     # Returns destination file path.
     def destination(dest)
       File.join(dest, @dir, @name)
     end
 
-    # Obtain mtime of the source path.
-    #
-    # Returns last modifiaction time for this file.
+    # Returns last modification time for this file.
     def mtime
       File.stat(path).mtime.to_i
     end
@@ -47,13 +44,14 @@ module Jekyll
     end
 
     # Write the static file to the destination directory (if modified).
-    #   +dest+ is the String path to the destination dir
+    #
+    # dest - The String path to the destination dir.
     #
     # Returns false if the file was not modified since last time (no-op).
     def write(dest)
       dest_path = destination(dest)
 
-      return false if File.exist? dest_path and !modified?
+      return false if File.exist?(dest_path) and !modified?
       @@mtimes[path] = mtime
 
       FileUtils.mkdir_p(File.dirname(dest_path))
@@ -67,7 +65,6 @@ module Jekyll
     # Returns nothing.
     def self.reset_cache
       @@mtimes = Hash.new
-
       nil
     end
   end

data/lib/jekyll/tags/highlight.rb

@@ -3,7 +3,7 @@ module Jekyll
   class HighlightBlock < Liquid::Block
     include Liquid::StandardFilters
 
-    # we need a language, but the linenos argument is optional.
+    # We need a language, but the linenos argument is optional.
     SYNTAX = /(\w+)\s?([\w\s=]+)*/
 
     def initialize(tag_name, markup, tokens)
@@ -24,7 +24,7 @@ module Jekyll
             tmp_options[key] = value
           end
           tmp_options = tmp_options.to_a.collect { |opt| opt.join('=') }
-          # additional options to pass to Albino.
+          # additional options to pass to Albino
           @options = { 'O' => tmp_options.join(',') }
         else
           @options = {}
@@ -50,7 +50,7 @@ module Jekyll
     end
 
     def render_codehighlighter(context, code)
-    #The div is required because RDiscount blows ass
+      #The div is required because RDiscount blows ass
       <<-HTML
 <div>
   <pre>
@@ -59,13 +59,13 @@ module Jekyll
 </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
-    
+
   end
 
 end

data/output/stylesheets/scribe.css

@@ -0,0 +1,177 @@
+/* ---------------------------------------------------------------------------
+   Bare AsciiDoc styles
+   Ryan Tomayko <r@tomayko.com>
+--------------------------------------------------------------------------- */
+
+body {
+	font-family:verdana,helvetica,arial,sans-serif;
+	font-size:81.25%;   /* 13px */
+	line-height:1.538;  /* 20px */
+	margin:40px auto 50px auto;
+	max-width:53.8461538462em; /* 790px */
+	color:#333;
+}
+
+em {
+	font-style:italic;
+}
+
+strong {
+	font-weight:bold;
+	color:#000;
+}
+
+tt {
+	font-family:consolas, 'lucida console', 'bitstream vera sans mono',
+	           'courier new', monospace;
+	color:#000;
+}
+
+p, ul, ol, dl {
+	margin:10px 0
+}
+
+dl {
+	margin-left:40px
+}
+
+dt {
+	font-weight:normal;
+	color:#000;
+}
+
+h1, h2, h3, h4, h5 {
+	font-family:'lucida grande',georgia,verdana,helvetica,arial,sans-serif;
+	font-weight:normal;
+	color:#000;
+}
+
+h1 {
+	font-size:40px;
+	line-height:1.428;
+	margin:20px 0;
+}
+
+h2 {
+	font-size:30px;
+	line-height:1.36363636; /* repeating, of course */
+	margin:60px 0 20px 0;
+}
+
+h2 + .sectionbody {}
+
+h3 {
+	font-size:24px;
+	line-height:1.1;
+	margin:30px 0 10px 0;
+}
+
+h4 {
+	font-size:18px;
+	line-height:1.1;
+	margin:20px 0 5px 0;
+}
+
+h5 {
+	font-size:13px;
+	font-style:italic;
+	line-height:1.1;
+}
+
+#header { 
+	text-align:center;
+	margin-bottom:30px;
+}
+
+#header h1 { margin-bottom:0 }
+
+.title, .sidebar-title {
+	font-weight:normal;
+	color:#000;
+	margin-bottom:0;
+}
+
+.admonitionblock .title {
+	font-weight:bold;
+}
+
+.admonitionblock {
+	margin:30px 0px;
+	color:#555;
+}
+
+.admonitionblock td.icon {
+	width:30px;
+	padding-right:20px;
+	padding-left:20px;
+	text-transform:uppercase;
+	font-weight:bold;
+	color:#888;
+}
+
+.listingblock {
+  margin: 13px 0;
+}
+
+.listingblock .content {
+	border:1px solid silver;
+	background:#eee;
+	padding:5px;
+}
+
+.listingblock .content pre {
+	margin:0;
+}
+
+.literalblock .content {
+	margin-left:40px;
+}
+
+.verseblock .content {
+	white-space:pre
+}
+
+.sidebarblock .sidebar-content {
+	border:1px solid silver;
+	background:#FFFFEE;
+	padding:0 10px;
+	color:#222;
+	font-size:smaller;
+	line-height:1.5;
+}
+
+.sidebar-title {
+	margin:10px 0;
+	font-weight:bold;
+	color:#442;
+}
+
+.quoteblock-content {
+	font-style:italic;
+	color:#444;
+	margin-left:40px;
+}
+
+.quoteblock-content .attribution {
+	font-style:normal;
+	text-align:right;
+	color:#000;
+}
+
+.exampleblock-content *:first-child { margin-top:0 }
+.exampleblock-content {
+	border-left:2px solid silver;
+	padding-left:8px;
+}
+
+#footer {
+	font-size:11px;
+	margin-top:40px;
+	border-top:1px solid silver;
+	color:#555;
+}
+
+#author {
+	color:#000;
+	text-transform:uppercase
+}

data/test/helper.rb

@@ -1,14 +1,14 @@
 require 'rubygems'
 gem 'RedCloth', '>= 4.2.1'
 
-require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
+require 'jekyll'
 
 require 'RedCloth'
 require 'rdiscount'
 require 'kramdown'
+require 'redcarpet'
 
-require 'test/unit'
-require 'redgreen'
+require 'redgreen' if RUBY_VERSION < '1.9'
 require 'shoulda'
 require 'rr'
 

data/test/source/_posts/2011-04-12-md-extension.md

@@ -0,0 +1,7 @@
+---
+date: 2011-04-12 13:07:09
+---
+
+under default configuration, this post should get processed by the identity converter. By changing 
+textile extension or markdown extension configuration parameters, you should be able to associate
+it with either of those converters

data/test/suite.rb

@@ -1,9 +1,11 @@
+require 'rubygems'
+gem 'test-unit'
 require 'test/unit'
 
 # for some reason these tests fail when run via TextMate
 # but succeed when run on the command line.
 
-tests = Dir["#{File.dirname(__FILE__)}/test_*.rb"]
+tests = Dir[File.expand_path("#{File.dirname(__FILE__)}/test_*.rb")]
 tests.each do |file|
   require file
 end

data/test/test_configuration.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestConfiguration < Test::Unit::TestCase
   context "loading configuration" do

data/test/test_core_ext.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestCoreExt < Test::Unit::TestCase
   context "hash" do

data/test/test_filters.rb

@@ -1,8 +1,13 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestFilters < Test::Unit::TestCase
   class JekyllFilter
     include Jekyll::Filters
+
+    def initialize
+      site = Jekyll::Site.new(Jekyll.configuration({}))
+      @context = Liquid::Context.new({}, {}, { :site => site })
+    end
   end
 
   context "filters" do
@@ -14,6 +19,10 @@ class TestFilters < Test::Unit::TestCase
       assert_equal "<p>something <strong>really</strong> simple</p>", @filter.textilize("something *really* simple")
     end
 
+    should "markdownify with simple string" do
+      assert_equal "<p>something <strong>really</strong> simple</p>", @filter.markdownify("something **really** simple")
+    end
+
     should "convert array to sentence string with no args" do
       assert_equal "", @filter.array_to_sentence_string([])
     end

data/test/test_generated_site.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestGeneratedSite < Test::Unit::TestCase
   context "generated sites" do
@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 26, @site.posts.size
+      assert_equal 28, @site.posts.size
     end
 
     should "insert site.posts into the index" do

data/test/test_kramdown.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestKramdown < Test::Unit::TestCase
   context "kramdown" do

data/test/test_page.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestPage < Test::Unit::TestCase
   def setup_page(file)

data/test/test_pager.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestPager < Test::Unit::TestCase
 

data/test/test_post.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestPost < Test::Unit::TestCase
   def setup_post(file)
@@ -52,6 +52,12 @@ class TestPost < Test::Unit::TestCase
         assert_equal "/2008/09/09/foo-bar.html", @post.url
       end
 
+      should "raise a good error on invalid post date" do
+        assert_raise Jekyll::FatalException do
+          @post.process("2009-27-03-foo-bar.textile")
+        end
+      end
+
       should "CGI escape urls" do
         @post.categories = []
         @post.process("2009-03-12-hash-#1.markdown")
@@ -391,6 +397,47 @@ class TestPost < Test::Unit::TestCase
       post = Post.new(@site, File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.textile')
       assert_equal ['foo'], post.categories
     end
-
   end
+  
+  context "converter file extension settings" do
+    setup do
+      stub(Jekyll).configuration { Jekyll::DEFAULTS }
+      @site = Site.new(Jekyll.configuration)
+    end
+    
+    should "process .md as markdown under default configuration" do
+      post = setup_post '2011-04-12-md-extension.md'
+      conv = post.converter
+      assert conv.kind_of? Jekyll::MarkdownConverter
+    end
+    
+    should "process .text as indentity under default configuration" do
+      post = setup_post '2011-04-12-text-extension.text'
+      conv = post.converter
+      assert conv.kind_of? Jekyll::IdentityConverter
+    end
+    
+    should "process .text as markdown under alternate configuration" do
+      @site.config['markdown_ext'] = 'markdown,mdw,mdwn,md,text'
+      post = setup_post '2011-04-12-text-extension.text'
+      conv = post.converter
+      assert conv.kind_of? Jekyll::MarkdownConverter
+    end
+    
+    should "process .md as markdown under alternate configuration" do
+      @site.config['markdown_ext'] = 'markdown,mkd,mkdn,md,text'
+      post = setup_post '2011-04-12-text-extension.text'
+      conv = post.converter
+      assert conv.kind_of? Jekyll::MarkdownConverter
+    end
+    
+    should "process .text as textile under alternate configuration" do
+      @site.config['textile_ext'] = 'textile,text'
+      post = setup_post '2011-04-12-text-extension.text'
+      conv = post.converter
+      assert conv.kind_of? Jekyll::TextileConverter
+    end
+    
+  end
+  
 end