mattmatt-jekyll 0.4.1 → 0.4.3

data/History.txt

@@ -1,3 +1,9 @@
+==
+  * Minor Enhancements
+    * Changed date format on wordpress converter (zeropadding) [github.com/dysinger]
+  * Bug Fixes
+    * Add jekyll binary as executable to gemspec [github.com/dysinger]
+
 == 0.4.0 / 2009-02-03
   * Major Enhancements
     * Switch to Jeweler for packaging tasks

data/Rakefile

@@ -55,7 +55,7 @@ task :default => :test
 
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -r ./lib/jekyll.rb"
+  sh "irb -rubygems -I lib -r jekyll.rb"
 end
 
 # converters

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 4
-:patch: 1
+:patch: 3

data/bin/jekyll

@@ -61,7 +61,11 @@ opts = OptionParser.new do |opts|
   opts.on("--permalink [TYPE]", "Use 'date' (default) for YYYY/MM/DD") do |style| 
     Jekyll.permalink_style = (style || 'date').to_sym
   end
-
+  
+  opts.on("--version", "Display current version") do
+    puts "Jekyll " + Jekyll.version
+    exit 0
+  end
 end
 
 opts.parse!

data/lib/jekyll/converters/wordpress.rb

@@ -10,8 +10,8 @@ require 'fileutils'
 
 module Jekyll
   module WordPress
-    
-    # Reads a MySQL database via Sequel and creates a post file for each 
+
+    # Reads a MySQL database via Sequel and creates a post file for each
     # post in wp_posts that has post_status = 'publish'.
     # This restriction is made because 'draft' posts are not guaranteed to
     # have valid dates.
@@ -19,20 +19,21 @@ module Jekyll
 
     def self.process(dbname, user, pass, host = 'localhost')
       db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
-      
+
       FileUtils.mkdir_p "_posts"
-            
+
       db[QUERY].each do |post|
         # Get required fields and construct Jekyll compatible name
         title = post[:post_title]
         slug = post[:post_name]
         date = post[:post_date]
         content = post[:post_content]
-        
-        name = [date.year, date.month, date.day, slug].join('-') + ".markdown"
+
+        name = "%02d-%02d-%02d-%s.markdown" % [date.year, date.month, date.day,
+                                               slug]
 
         # Get the relevant fields as a hash, delete empty fields and convert
-        # to YAML for the header        
+        # to YAML for the header
         data = {
            'layout' => 'post',
            'title' => title.to_s,
@@ -51,4 +52,4 @@ module Jekyll
 
     end
   end
-end
+end

data/lib/jekyll/post.rb

@@ -46,11 +46,11 @@ module Jekyll
 				self.published = true
 			end
       
-      if self.categories.empty?
+      self.data['categories'] = if self.categories.empty?
         if self.data.has_key?('category')
           self.categories << self.data['category']
         elsif self.data.has_key?('categories')
-          self.categories = self.data['categories'].split
+          self.categories = (self.data['categories'] || "").split
         end
       end
     end

data/lib/jekyll.rb

@@ -43,8 +43,6 @@ require 'jekyll/tags/include'
 require 'jekyll/albino'
 
 module Jekyll
-  VERSION = '0.3.0'
-  
   class << self
     attr_accessor :source, :dest, :lsi, :pygments, :markdown_proc, :content_type, :permalink_style
   end
@@ -61,4 +59,9 @@ module Jekyll
     Jekyll.dest = dest
     Jekyll::Site.new(source, dest).process
   end
+  
+  def self.version
+    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
+    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
+  end
 end

data/test/source/_posts/2009-01-27-no-categories.textile

@@ -0,0 +1,7 @@
+---
+layout: default
+title: Categories in YAML
+categories: 
+---
+
+Best *post* ever

data/test/test_post.rb

@@ -84,6 +84,7 @@ class TestPost < Test::Unit::TestCase
   def test_yaml_category
     p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '',  "2009-01-27-category.textile")
     assert p.categories.include?('foo')
+    assert p.data['categories'].include?('foo')
   end
 
   def test_yaml_categories
@@ -91,6 +92,13 @@ class TestPost < Test::Unit::TestCase
     assert p.categories.include?('foo')
     assert p.categories.include?('bar')
     assert p.categories.include?('baz')
+    assert p.data['categories'].include?('foo')
+  end
+  
+  def test_empty_yaml_categories
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '',  "2009-01-27-no-categories.textile")
+    assert p.categories.empty?
+    assert p.data['categories'].empty?
   end
   
   def test_render

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattmatt-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-02-16 00:00:00 -08:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: classifier
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: maruku
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -50,6 +54,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -59,6 +64,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: open4
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -112,6 +118,10 @@ files:
 - test/dest/2008/12
 - test/dest/2008/12/13
 - test/dest/2008/12/13/include.html
+- test/dest/2009
+- test/dest/2009/01
+- test/dest/2009/01/27
+- test/dest/2009/01/27/no-categories.html
 - test/dest/_posts
 - test/dest/_posts/2008-02-02-not-published.html
 - test/dest/_posts/2008-02-02-published.html
@@ -121,6 +131,7 @@ files:
 - test/dest/_posts/2008-12-13-include.html
 - test/dest/_posts/2009-01-27-categories.html
 - test/dest/_posts/2009-01-27-category.html
+- test/dest/_posts/2009-01-27-no-categories.html
 - test/dest/category
 - test/dest/category/2008
 - test/dest/category/2008/09
@@ -179,6 +190,7 @@ files:
 - test/source/_posts/2008-12-13-include.markdown
 - test/source/_posts/2009-01-27-categories.textile
 - test/source/_posts/2009-01-27-category.textile
+- test/source/_posts/2009-01-27-no-categories.textile
 - test/source/category
 - test/source/category/_posts
 - test/source/category/_posts/2008-9-23-categories.textile