sixones-jekyll 0.5.1 → 0.5.2

data/test/test_tags.rb

@@ -1,35 +1,116 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestTags < Test::Unit::TestCase
-  context "tagging" do
-    setup do
-      @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"
+{% 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
 
-puts "bye"
+  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
 
-    should "render markdown with pygments line handling" do
-      stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'pygments' => true})
+    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
-      site = Site.new(Jekyll.configuration)
-      info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
 
-      result = Liquid::Template.parse(@content).render({}, info)
-      result = site.markdown(result)
-      assert_no_match(/markdown\-html\-error/,result)
+      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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sixones-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 -07:00
+date: 2009-06-24 00:00:00 -07:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 4.0.4
+        version: 4.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -81,11 +81,22 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
+- .gitignore
 - History.txt
 - README.textile
 - Rakefile
 - VERSION.yml
 - bin/jekyll
+- features/create_sites.feature
+- features/embed_filters.feature
+- features/pagination.feature
+- features/permalinks.feature
+- features/post_data.feature
+- features/site_configuration.feature
+- features/site_data.feature
+- features/step_definitions/jekyll_steps.rb
+- features/support/env.rb
+- jekyll.gemspec
 - lib/jekyll.rb
 - lib/jekyll/albino.rb
 - lib/jekyll/converters/csv.rb
@@ -96,10 +107,10 @@ files:
 - lib/jekyll/converters/wordpress.rb
 - lib/jekyll/convertible.rb
 - lib/jekyll/core_ext.rb
-- lib/jekyll/custom_filters.rb
 - lib/jekyll/filters.rb
 - lib/jekyll/layout.rb
 - lib/jekyll/page.rb
+- lib/jekyll/pager.rb
 - lib/jekyll/post.rb
 - lib/jekyll/site.rb
 - lib/jekyll/tags/highlight.rb
@@ -117,18 +128,29 @@ files:
 - 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/_posts/2009-05-18-tag.textile
+- test/source/_posts/2009-05-18-tags.textile
+- test/source/_posts/2009-06-22-empty-yaml.textile
+- test/source/_posts/2009-06-22-no-yaml.textile
+- test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
+- test/source/contacts.html
 - test/source/css/screen.css
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
+- test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
+- test/test_configuration.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
+- test/test_page.rb
+- test/test_pager.rb
 - test/test_post.rb
 - test/test_site.rb
 - test/test_tags.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/mojombo/jekyll
 post_install_message: 
 rdoc_options: 
@@ -152,13 +174,16 @@ requirements: []
 rubyforge_project: jekyll
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Jekyll is a simple, blog aware, static site generator.
 test_files: 
 - test/helper.rb
 - test/suite.rb
+- test/test_configuration.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
+- test/test_page.rb
+- test/test_pager.rb
 - test/test_post.rb
 - test/test_site.rb
 - test/test_tags.rb

data/lib/jekyll/custom_filters.rb

@@ -1,25 +0,0 @@
-module Jekyll
-  module Filters
-    module Custom
-      def self.extensions; @@extensions; end
-
-      @@extensions = [ ]
-    
-      def self.included(base)
-        @@extensions << base
-      end
-      
-      def self.invoke_filter(name, params)
-        self.send(name, params)
-      end
-    end
-    
-    module Basic
-      include Jekyll::Filters::Custom
-      
-      def hello_world(input)
-        "Hello World!"
-      end
-    end
-  end
-end