jekyll 0.3.0 → 0.4.1

data/test/test_site.rb

@@ -22,9 +22,12 @@ class TestSite < Test::Unit::TestCase
     assert_equal 4, @s.posts.size
   end
   
-  def test_write_posts
+  def test_site_payload
     clear_dest
-    
     @s.process
+    
+    assert_equal 7, @s.posts.length
+    assert_equal ["category", "foo", "z_category"].sort, @s.categories.keys.sort
+    assert_equal 1, @s.categories['foo'].length
   end
 end

data/test/test_tags.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestTags < Test::Unit::TestCase
+  
+  def setup
+    @content = <<CONTENT
+---
+layout: post
+title: This is a test
+
+---
+This document results in a markdown error with maruku
+{% highlight ruby %}
+puts "hi"
+
+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
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-24 00:00:00 -08:00
-default_executable: 
+date: 2009-02-10 00:00:00 -08:00
+default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 4.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.9.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: classifier
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: maruku
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -70,40 +70,29 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.6
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: 
-email: 
-- tom@mojombo.com
+description: Jekyll is a simple, blog aware, static site generator.
+email: tom@mojombo.com
 executables: 
 - jekyll
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
+extra_rdoc_files: []
+
 files: 
 - History.txt
-- Manifest.txt
 - README.textile
-- Rakefile
+- VERSION.yml
 - bin/jekyll
-- jekyll.gemspec
-- lib/jekyll.rb
+- lib/jekyll
 - lib/jekyll/albino.rb
+- lib/jekyll/converters
 - lib/jekyll/converters/csv.rb
 - lib/jekyll/converters/mephisto.rb
 - lib/jekyll/converters/mt.rb
+- lib/jekyll/converters/textpattern.rb
+- lib/jekyll/converters/typo.rb
 - lib/jekyll/converters/wordpress.rb
 - lib/jekyll/convertible.rb
 - lib/jekyll/core_ext.rb
@@ -112,29 +101,91 @@ 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-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/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: 
+homepage: http://github.com/mojombo/jekyll
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --inline-source
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -156,8 +207,5 @@ rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Jekyll is a simple, blog aware, static site generator.
-test_files: 
-- test/test_generated_site.rb
-- test/test_jekyll.rb
-- test/test_post.rb
-- test/test_site.rb
+test_files: []
+

data/Manifest.txt

@@ -1,36 +0,0 @@
-History.txt
-Manifest.txt
-README.textile
-Rakefile
-bin/jekyll
-jekyll.gemspec
-lib/jekyll.rb
-lib/jekyll/albino.rb
-lib/jekyll/converters/csv.rb
-lib/jekyll/converters/mephisto.rb
-lib/jekyll/converters/mt.rb
-lib/jekyll/converters/wordpress.rb
-lib/jekyll/convertible.rb
-lib/jekyll/core_ext.rb
-lib/jekyll/filters.rb
-lib/jekyll/layout.rb
-lib/jekyll/page.rb
-lib/jekyll/post.rb
-lib/jekyll/site.rb
-lib/jekyll/tags/highlight.rb
-lib/jekyll/tags/include.rb
-test/helper.rb
-test/source/_includes/sig.markdown
-test/source/_layouts/default.html
-test/source/_layouts/simple.html
-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/css/screen.css
-test/source/index.html
-test/suite.rb
-test/test_generated_site.rb
-test/test_jekyll.rb
-test/test_post.rb
-test/test_site.rb

data/Rakefile

@@ -1,24 +0,0 @@
-require 'rubygems'
-require 'hoe'
-require 'lib/jekyll'
-
-Hoe.new('jekyll', Jekyll::VERSION) do |p|
-  p.developer('Tom Preston-Werner', 'tom@mojombo.com')
-  p.summary = "Jekyll is a simple, blog aware, static site generator."
-  p.extra_deps = ['RedCloth', 'liquid', 'classifier', 'maruku', 'directory_watcher', 'open4']
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/jekyll.rb"
-end
-
-namespace :convert do
-  desc "Migrate from mephisto in the current directory"
-  task :mephisto do
-    sh %q(ruby -r './lib/jekyll/converters/mephisto' -e 'Jekyll::Mephisto.postgres(:database => "#{ENV["DB"]}")')
-  end
-  task :mt do
-    sh %q(ruby -r './lib/jekyll/converters/mt' -e 'Jekyll::MT.process("#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")')
-  end
-end

data/jekyll.gemspec

@@ -1,51 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{jekyll}
-  s.version = "0.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2008-12-24}
-  s.default_executable = %q{jekyll}
-  s.email = ["tom@mojombo.com"]
-  s.executables = ["jekyll"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "jekyll.gemspec", "lib/jekyll.rb", "lib/jekyll/albino.rb", "lib/jekyll/converters/csv.rb", "lib/jekyll/converters/mephisto.rb", "lib/jekyll/converters/mt.rb", "lib/jekyll/converters/wordpress.rb", "lib/jekyll/convertible.rb", "lib/jekyll/core_ext.rb", "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "test/helper.rb", "test/source/_includes/sig.markdown", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "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/css/screen.css", "test/source/index.html", "test/suite.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb"]
-  s.has_rdoc = true
-  s.rdoc_options = ["--main", "README.txt"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{jekyll}
-  s.rubygems_version = %q{1.3.0}
-  s.summary = %q{Jekyll is a simple, blog aware, static site generator.}
-  s.test_files = ["test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
-      s.add_runtime_dependency(%q<liquid>, [">= 0"])
-      s.add_runtime_dependency(%q<classifier>, [">= 0"])
-      s.add_runtime_dependency(%q<maruku>, [">= 0"])
-      s.add_runtime_dependency(%q<directory_watcher>, [">= 0"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
-    else
-      s.add_dependency(%q<RedCloth>, [">= 0"])
-      s.add_dependency(%q<liquid>, [">= 0"])
-      s.add_dependency(%q<classifier>, [">= 0"])
-      s.add_dependency(%q<maruku>, [">= 0"])
-      s.add_dependency(%q<directory_watcher>, [">= 0"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
-    end
-  else
-    s.add_dependency(%q<RedCloth>, [">= 0"])
-    s.add_dependency(%q<liquid>, [">= 0"])
-    s.add_dependency(%q<classifier>, [">= 0"])
-    s.add_dependency(%q<maruku>, [">= 0"])
-    s.add_dependency(%q<directory_watcher>, [">= 0"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
-  end
-end