RubyGems - jekyll - Versions diffs - 0.4.1 → 0.5.1 - Mend

jekyll 0.4.1 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of jekyll might be problematic. Click here for more details.

Files changed (51) hide show

data/History.txt +31 -1
data/README.textile +23 -457
data/Rakefile +91 -0
data/VERSION.yml +2 -2
data/bin/jekyll +61 -57
data/lib/jekyll.rb +48 -32
data/lib/jekyll/albino.rb +13 -7
data/lib/jekyll/converters/mephisto.rb +8 -8
data/lib/jekyll/converters/mt.rb +8 -8
data/lib/jekyll/converters/textpattern.rb +4 -4
data/lib/jekyll/converters/typo.rb +8 -8
data/lib/jekyll/converters/wordpress.rb +1 -2
data/lib/jekyll/convertible.rb +33 -22
data/lib/jekyll/core_ext.rb +5 -5
data/lib/jekyll/filters.rb +15 -7
data/lib/jekyll/layout.rb +9 -6
data/lib/jekyll/page.rb +13 -10
data/lib/jekyll/post.rb +108 -39
data/lib/jekyll/site.rb +121 -51
data/lib/jekyll/tags/highlight.rb +12 -9
data/lib/jekyll/tags/include.rb +5 -5
data/test/helper.rb +20 -6
data/test/source/_posts/2008-02-02-not-published.textile +8 -0
data/test/source/_posts/2008-02-02-published.textile +8 -0
data/test/source/_posts/2009-01-27-array-categories.textile +10 -0
data/test/source/_posts/2009-01-27-categories.textile +7 -0
data/test/source/_posts/2009-01-27-category.textile +7 -0
data/test/source/_posts/2009-03-12-hash-#1.markdown +6 -0
data/test/test_filters.rb +39 -27
data/test/test_generated_site.rb +32 -16
data/test/test_post.rb +258 -102
data/test/test_site.rb +60 -28
data/test/test_tags.rb +103 -18
metadata +25 -70
data/test/dest/2008/10/18/foo-bar.html +0 -28
data/test/dest/2008/11/21/complex.html +0 -29
data/test/dest/2008/12/13/include.html +0 -30
data/test/dest/_posts/2008-10-18-foo-bar.html +0 -28
data/test/dest/_posts/2008-11-21-complex.html +0 -29
data/test/dest/_posts/2008-12-03-permalinked-post.html +0 -2
data/test/dest/_posts/2008-12-13-include.html +0 -30
data/test/dest/category/2008/09/23/categories.html +0 -27
data/test/dest/category/_posts/2008-9-23-categories.html +0 -27
data/test/dest/css/screen.css +0 -76
data/test/dest/foo/2008/12/12/topical-post.html +0 -28
data/test/dest/foo/_posts/bar/2008-12-12-topical-post.html +0 -28
data/test/dest/index.html +0 -60
data/test/dest/my_category/permalinked-post +0 -2
data/test/dest/z_category/2008/09/23/categories.html +0 -27
data/test/dest/z_category/_posts/2008-9-23-categories.html +0 -27
data/test/test_jekyll.rb +0 -0

data/test/test_tags.rb CHANGED

@@ -1,31 +1,116 @@
 require File.dirname(__FILE__) + '/helper'
 class TestTags < Test::Unit::TestCase
-  def setup
-    @content = <<CONTENT
+  def create_post(content, override = {}, markdown = true)
+    stub(Jekyll).configuration do
+      Jekyll::DEFAULTS.merge({'pygments' => true}).merge(override)
+    end
+    site = Site.new(Jekyll.configuration)
+    info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
+    if markdown
+      payload = {"content_type" => "markdown"}
+    else
+      payload = {"content_type" => "textile"}
+    end
+    @result = Liquid::Template.parse(content).render(payload, info)
+    if markdown
+      @result = site.markdown(@result)
+    else
+      @result = site.textile(@result)
+    end
+  end
+  def fill_post(code, override = {})
+    content = <<CONTENT
 ---
-layout: post
 title: This is a test
 ---
 This document results in a markdown error with maruku
-{% highlight ruby %}
-puts "hi"
-puts "bye"
+{% highlight text %}
+#{code}
 {% endhighlight %}
+CONTENT
+    create_post(content, override)
+  end
+  context "post content has highlight tag" do
+    setup do
+      fill_post("test")
+    end
+    should "not cause a markdown error" do
+      assert_no_match /markdown\-html\-error/, @result
+    end
+    should "render markdown with pygments line handling" do
+      assert_match %{<pre>test\n</pre>}, @result
+    end
+  end
+  context "post content has highlight tag with UTF character" do
+    setup do
+      fill_post("Æ")
+    end
+    should "render markdown with pygments line handling" do
+      assert_match %{<pre>Æ\n</pre>}, @result
+    end
+  end
+  context "simple post with markdown and pre tags" do
+    setup do
+      @content = <<CONTENT
+---
+title: Maruku vs. RDiscount
+---
+_FIGHT!_
+{% highlight ruby %}
+puts "3..2..1.."
+{% endhighlight %}
+*FINISH HIM*
 CONTENT
-  end
-  def test_markdown_with_pygments_line_handling
-    Jekyll.pygments = true
-    Jekyll.content_type = :markdown
-    result = Liquid::Template.parse(@content).render({}, [Jekyll::Filters])
-    result = Jekyll.markdown_proc.call(result)
-    assert_no_match(/markdown\-html\-error/,result)
+    end
+    context "using Textile" do
+      setup do
+        create_post(@content, {}, false)
+      end
+      # Broken in RedCloth 4.1.9
+      should "not textilize highlight block" do
+        assert_no_match %r{3\.\.2\.\.1\.\.&quot;</span><br />}, @result
+      end
+    end
+    context "using Maruku" do
+      setup do
+        create_post(@content)
+      end
+      should "parse correctly" do
+        assert_match %r{<em>FIGHT!</em>}, @result
+        assert_match %r{<em>FINISH HIM</em>}, @result
+      end
+    end
+    context "using RDiscount" do
+      setup do
+        create_post(@content, 'markdown' => 'rdiscount')
+      end
+      should "parse correctly" do
+        assert_match %r{<em>FIGHT!</em>}, @result
+        assert_match %r{<em>FINISH HIM</em>}, @result
+      end
+    end
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-05-06 00:00:00 -04:00
 default_executable: jekyll
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -18,9 +18,9 @@ dependencies:
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.0
     version:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -78,16 +78,16 @@ executables:
 - jekyll
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.textile
 files:
 - History.txt
 - README.textile
+- Rakefile
 - VERSION.yml
 - bin/jekyll
-- lib/jekyll
+- lib/jekyll.rb
 - lib/jekyll/albino.rb
-- lib/jekyll/converters
 - lib/jekyll/converters/csv.rb
 - lib/jekyll/converters/mephisto.rb
 - lib/jekyll/converters/mt.rb
@@ -101,90 +101,39 @@ files:
 - lib/jekyll/page.rb
 - lib/jekyll/post.rb
 - lib/jekyll/site.rb
-- lib/jekyll/tags
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
-- lib/jekyll.rb
-- test/dest
-- test/dest/2008
-- test/dest/2008/10
-- test/dest/2008/10/18
-- test/dest/2008/10/18/foo-bar.html
-- test/dest/2008/11
-- test/dest/2008/11/21
-- test/dest/2008/11/21/complex.html
-- test/dest/2008/12
-- test/dest/2008/12/13
-- test/dest/2008/12/13/include.html
-- test/dest/_posts
-- test/dest/_posts/2008-10-18-foo-bar.html
-- test/dest/_posts/2008-11-21-complex.html
-- test/dest/_posts/2008-12-03-permalinked-post.html
-- test/dest/_posts/2008-12-13-include.html
-- test/dest/category
-- test/dest/category/2008
-- test/dest/category/2008/09
-- test/dest/category/2008/09/23
-- test/dest/category/2008/09/23/categories.html
-- test/dest/category/_posts
-- test/dest/category/_posts/2008-9-23-categories.html
-- test/dest/css
-- test/dest/css/screen.css
-- test/dest/foo
-- test/dest/foo/2008
-- test/dest/foo/2008/12
-- test/dest/foo/2008/12/12
-- test/dest/foo/2008/12/12/topical-post.html
-- test/dest/foo/_posts
-- test/dest/foo/_posts/bar
-- test/dest/foo/_posts/bar/2008-12-12-topical-post.html
-- test/dest/index.html
-- test/dest/my_category
-- test/dest/my_category/permalinked-post
-- test/dest/z_category
-- test/dest/z_category/2008
-- test/dest/z_category/2008/09
-- test/dest/z_category/2008/09/23
-- test/dest/z_category/2008/09/23/categories.html
-- test/dest/z_category/_posts
-- test/dest/z_category/_posts/2008-9-23-categories.html
 - test/helper.rb
-- test/source
-- test/source/_includes
 - test/source/_includes/sig.markdown
-- test/source/_layouts
 - test/source/_layouts/default.html
 - test/source/_layouts/simple.html
-- test/source/_posts
+- 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/category
-- test/source/category/_posts
+- 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-03-12-hash-#1.markdown
 - test/source/category/_posts/2008-9-23-categories.textile
-- test/source/css
 - test/source/css/screen.css
-- test/source/foo
-- test/source/foo/_posts
-- test/source/foo/_posts/bar
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
-- test/source/z_category
-- test/source/z_category/_posts
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
-- test/test_jekyll.rb
 - test/test_post.rb
 - test/test_site.rb
 - test/test_tags.rb
 has_rdoc: true
 homepage: http://github.com/mojombo/jekyll
+licenses: []
 post_install_message:
 rdoc_options:
-- --inline-source
 - --charset=UTF-8
 require_paths:
 - lib
@@ -203,9 +152,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: jekyll
-rubygems_version: 1.3.0
+rubygems_version: 1.3.5
 signing_key:
 specification_version: 2
 summary: Jekyll is a simple, blog aware, static site generator.
-test_files: []
+test_files:
+- test/helper.rb
+- test/suite.rb
+- test/test_filters.rb
+- test/test_generated_site.rb
+- test/test_post.rb
+- test/test_site.rb
+- test/test_tags.rb

data/test/dest/2008/10/18/foo-bar.html DELETED

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Foo Bar</title>
-   <meta name="author" content="<%= @page.author %>" />
-   <!-- CodeRay syntax highlighting CSS -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
-   <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
-</head>
-<body>
-<div class="site">
-  <div class="title">
-    Tom Preston-Werner
-  </div>
-  <h1>Foo Bar</h1>
-<p>Best <strong>post</strong> ever</p>
-</div>
-</body>
-</html>

data/test/dest/2008/11/21/complex.html DELETED

@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Complex</title>
-   <meta name="author" content="<%= @page.author %>" />
-   <!-- CodeRay syntax highlighting CSS -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
-   <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
-</head>
-<body>
-<div class="site">
-  <div class="title">
-    Tom Preston-Werner
-  </div>
-  <p>url: /2008/11/21/complex.html<br />
-date: Fri Nov 21 00:00:00 -0800 2008<br />
-id: /2008/11/21/complex</p>
-</div>
-</body>
-</html>

data/test/dest/2008/12/13/include.html DELETED

@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Include</title>
-   <meta name="author" content="<%= @page.author %>" />
-   <!-- CodeRay syntax highlighting CSS -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
-   <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
-</head>
-<body>
-<div class="site">
-  <div class="title">
-    Tom Preston-Werner
-  </div>
-  <hr />
-<p>Tom Preston-Werner github.com/mojombo</p>
-<p>This <em>is</em> cool</p>
-</div>
-</body>
-</html>

data/test/dest/_posts/2008-10-18-foo-bar.html DELETED

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Foo Bar</title>
-   <meta name="author" content="<%= @page.author %>" />
-   <!-- CodeRay syntax highlighting CSS -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
-   <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
-</head>
-<body>
-<div class="site">
-  <div class="title">
-    Tom Preston-Werner
-  </div>
-  <h1>Foo Bar</h1>
-<p>Best <strong>post</strong> ever</p>
-</div>
-</body>
-</html>

data/test/dest/_posts/2008-11-21-complex.html DELETED

@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
-   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-   <title>Complex</title>
-   <meta name="author" content="<%= @page.author %>" />
-   <!-- CodeRay syntax highlighting CSS -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" />
-   <!-- Homepage CSS -->
-   <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
-</head>
-<body>
-<div class="site">
-  <div class="title">
-    Tom Preston-Werner
-  </div>
-  <p>url: <br />
-date: <br />
-id:</p>
-</div>
-</body>
-</html>