jekyll 0.1.3 → 0.1.4

data/History.txt

@@ -1,4 +1,8 @@
-== 0.1.3 /
+== 0.1.4 / 2008-12-08
+  * Bug Fixes
+    * DATA does not work properly with rubygems
+
+== 0.1.3 / 2008-12-06
   * Major Features
     * Markdown support [github.com/vanpelt]
     * Mephisto and CSV converters [github.com/vanpelt]

data/README.textile

@@ -50,7 +50,7 @@ And if you don't want to be in the proto site root to run Jekyll:
 
   $ jekyll /path/to/proto/site /path/to/place/generated/site
   
-The autobuid feature can be used on any of the invocations.
+The autobuild feature can be used on any of the invocations.
 
 h2. Contribute
 

data/bin/jekyll

@@ -2,13 +2,24 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
+help = <<HELP
+Jekyll is a blog-aware, static site generator.
+
+Basic Command Line Usage:
+  jekyll                                                   # . -> ./_site
+  jekyll <path to write generated site>                    # . -> <path>
+  jekyll <path to source> <path to write generated site>   # <path> -> <path>
+    
+  Options:
+HELP
+
 require 'optparse'
 require 'jekyll'
 
 options = {}
 
 opts = OptionParser.new do |opts|
-  opts.banner = DATA.read
+  opts.banner = help
 
   opts.on("--auto", "Auto-regenerate") do
     options[:auto] = true
@@ -67,14 +78,4 @@ if options[:auto]
   loop { sleep 1000 }
 else
   Jekyll.process(source, destination)
-end
-
-__END__
-Jekyll is a blog-aware, static site generator.
-
-Basic Command Line Usage:
-  jekyll                                                   # . -> ./_site
-  jekyll <path to write generated site>                    # . -> <path>
-  jekyll <path to source> <path to write generated site>   # <path> -> <path>
-    
-  Options:
+end

data/jekyll.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{jekyll}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]

data/lib/jekyll.rb

@@ -26,7 +26,7 @@ require 'jekyll/filters'
 require 'jekyll/blocks'
 
 module Jekyll
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   
   def self.process(source, dest)
     Jekyll::Site.new(source, dest).process

data/lib/jekyll/post.rb

@@ -55,13 +55,27 @@ module Jekyll
     end
     
     # The generated directory into which the post will be placed
-    # upon generation. e.g. "/2008/11/05/"
+    # upon generation. This is derived from the permalink or, if
+    # permalink is absent, set to the default date
+    # e.g. "/2008/11/05/"
     #
     # Returns <String>
     def dir
-      self.date.strftime("/%Y/%m/%d/")
+      permalink ?
+        permalink.to_s.split("/")[0..-2].join("/") :
+        date.strftime("/%Y/%m/%d/")
     end
     
+    # The full path and filename of the post.
+    # Defined in the YAML of the post body
+    # (Optional)
+    #
+    # Returns <String>
+    def permalink
+      self.data && self.data['permalink']
+    end
+
+
     # The generated relative url of this post
     # e.g. /2008/11/05/my-awesome-post.html
     #
@@ -111,7 +125,7 @@ module Jekyll
     #
     # Returns nothing
     def write(dest)
-      FileUtils.mkdir_p(File.join(dest, self.dir))
+      FileUtils.mkdir_p(File.join(dest, dir))
       
       path = File.join(dest, self.url)
       File.open(path, 'w') do |f|

data/test/test_post.rb

@@ -26,6 +26,22 @@ class TestPost < Test::Unit::TestCase
     assert_equal "/2008/10/19/foo-bar.html", p.url
   end
   
+  def test_permalink
+    p = Post.allocate
+    p.process("2008-12-03-permalinked-post.textile")
+    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source posts]), "2008-12-03-permalinked-post.textile")
+
+    assert_equal "my_category/permalinked-post", p.permalink
+  end
+
+  def test_dir_respects_permalink
+    p = Post.allocate
+    p.process("2008-12-03-permalinked-post.textile")
+    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source posts]), "2008-12-03-permalinked-post.textile")
+
+    assert_equal "my_category", p.dir
+  end
+
   def test_read_yaml
     p = Post.allocate
     p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-06 00:00:00 -08:00
+date: 2008-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency