sixones-jekyll 0.4.1 → 0.5.0

data/test/test_site.rb

@@ -1,45 +1,57 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestSite < Test::Unit::TestCase
-  def setup
-    @source = File.join(File.dirname(__FILE__), *%w[source])
-    @s = Site.new(@source, dest_dir)
-  end
-  
-  def test_site_init
-    
-  end
-  
-  def test_read_layouts
-    @s.read_layouts
-    
-    assert_equal ["default", "simple"].sort, @s.layouts.keys.sort
-  end
- 
-  def test_read_posts
-    @s.read_posts('')
-    posts = Dir[File.join(@source, '_posts/*')]
-    assert_equal posts.size - 1, @s.posts.size
-  end
-  
-  def test_site_payload
-    clear_dest
-    @s.process
-    
-    posts = Dir[File.join(@source, "**", "_posts/*")]
-    categories = %w(bar baz category foo z_category publish_test).sort
-
-    assert_equal posts.size - 1, @s.posts.size
-    assert_equal categories, @s.categories.keys.sort
-    assert_equal 4, @s.categories['foo'].size
-  end
+  context "creating sites" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+      @site = Site.new(Jekyll.configuration)
+    end
+
+    should "reset data before processing" do
+      clear_dest
+      @site.process
+      before_posts = @site.posts.length
+      before_layouts = @site.layouts.length
+      before_categories = @site.categories.length
+
+      @site.process
+      assert_equal before_posts, @site.posts.length
+      assert_equal before_layouts, @site.layouts.length
+      assert_equal before_categories, @site.categories.length
+    end
+
+    should "read layouts" do
+      @site.read_layouts
+      assert_equal ["default", "simple"].sort, @site.layouts.keys.sort
+    end
+
+    should "read posts" do
+      @site.read_posts('')
+      posts = Dir[source_dir('_posts', '*')]
+      assert_equal posts.size - 1, @site.posts.size
+    end
+
+    should "deploy payload" do
+      clear_dest
+      @site.process
+
+      posts = Dir[source_dir("**", "_posts", "*")]
+      categories = %w(bar baz category foo z_category publish_test).sort
+
+      assert_equal posts.size - 1, @site.posts.size
+      assert_equal categories, @site.categories.keys.sort
+      assert_equal 4, @site.categories['foo'].size
+    end
 
-  def test_filter_entries
-    ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown#
+    should "filter entries" do
+      ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown#
               .baz.markdow foo.markdown~]
-    ent2 = %w[.htaccess _posts bla.bla]
+      ent2 = %w[.htaccess _posts bla.bla]
 
-    assert_equal %w[foo.markdown bar.markdown baz.markdown], @s.filter_entries(ent1)
-    assert_equal ent2, @s.filter_entries(ent2)
+      assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
+      assert_equal ent2, @site.filter_entries(ent2)
+    end
   end
 end

data/test/test_tags.rb

@@ -1,15 +1,16 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestTags < Test::Unit::TestCase
-  
-  def setup
-    @content = <<CONTENT
+  context "tagging" do
+    setup do
+      @content = <<CONTENT
 ---
 layout: post
 title: This is a test
 
 ---
 This document results in a markdown error with maruku
+
 {% highlight ruby %}
 puts "hi"
 
@@ -17,15 +18,18 @@ puts "bye"
 {% endhighlight %}
 
 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
+
+    should "render markdown with pygments line handling" do
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({'pygments' => true})
+      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)
+    end
   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sixones-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 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-04-07 00:00:00 -07:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -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
@@ -97,87 +97,33 @@ files:
 - lib/jekyll/convertible.rb
 - lib/jekyll/core_ext.rb
 - lib/jekyll/filters.rb
-- lib/jekyll/custom_filters.rb
 - lib/jekyll/layout.rb
 - 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/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
@@ -185,7 +131,6 @@ has_rdoc: true
 homepage: http://github.com/mojombo/jekyll
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -208,5 +153,11 @@ rubygems_version: 1.2.0
 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/lib/jekyll/custom_filters.rb

@@ -1,13 +0,0 @@
-module Jekyll
-  module Filters
-    module Custom
-      def self.extensions; @@extensions; end
-
-      @@extensions = [ ]
-    
-      def self.included(base)
-        @@extensions << base
-      end
-    end
-  end
-end