qrush-jekyll 0.3.0.1 → 0.4.0

data/History.txt

@@ -1,8 +1,27 @@
 ==
+  * 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
   * Minor Enhancements
     * Type importer [github.com/codeslinger]
     * site.topics accessor [github.com/baz]
     * Add array_to_sentence_string filter [github.com/mchung]
+    * Add a converter for textpattern [github.com/PerfectlyNormal]
+    * Add a working Mephisto / MySQL converter [github.com/ivey]
+    * Allowing .htaccess files to be copied over into the generated site [github.com/briandoll]
+    * Add option to not put file date in permalink URL [github.com/mreid]
+    * Add line number capabilities to highlight blocks [github.com/jcon]
+  * Bug Fixes
+    * Fix permalink behavior [github.com/cavalle]
+    * Fixed an issue with pygments, markdown, and newlines [github.com/zpinter]
+    * Ampersands need to be escaped [github.com/pufuwozu, github.com/ap]
+    * Test and fix the site.categories hash [github.com/zzot]
+    * Fix site payload available to files [github.com/matrix9180]
 
 == 0.3.0 / 2008-12-24
   * Major Enhancements

data/README.textile

@@ -34,7 +34,7 @@ fields such as <code>title</code> and <code>date</code>.
 Jekyll gets the list of blog posts by parsing the files in any
 "_posts":http://github.com/mojombo/tpw/tree/master/_posts directory found in
 subdirectories below the root. 
-Each post's filename contains the publishing date and slug (what shows up in the
+Each post's filename contains (by default) the publishing date and slug (what shows up in the
 URL) that the final HTML file should have. Open up the file corresponding to a
 blog post:
 "2008-11-17-blogging-like-a-hacker.textile":http://github.com/mojombo/tpw/tree/master/_posts/2008-11-17-blogging-like-a-hacker.textile.
@@ -145,6 +145,17 @@ Default port is 4000:
 
   $ jekyll --server [PORT]
 
+By default, the permalink for each post begins with its date in 'YYYY/MM/DD'
+format. If you do not wish to have the date appear in the URL of each post, 
+you can change the permalink style to 'none' so that only the 'slug' part of
+the filename is used. For example, with the permalink style set to 'none' the
+file '2009-01-01-happy-new-year.markdown' will have a permalink like
+'http://yoursite.com/happy-new-year.html'. The date of the post will still be
+read from the filename (and is required!) to be used elsewhere in Jekyll.
+Example usage:
+
+  $ jekyll --permalink none
+
 h2. Data
 
 Jekyll traverses your site looking for files to process. Any files with YAML
@@ -331,17 +342,33 @@ The argument to <code>highlight</code> is the language identifier. To find the
 appropriate identifier to use for your favorite language, look for the "short
 name" on the "Lexers":http://pygments.org/docs/lexers/ page.
 
+There is a second argument to <code>highlight</code> called
+<code>linenos</code> that is optional. Including the <code>linenos</code>
+argument will force the highlighted code to include line numbers. For
+instance, the following code block would include line numbers next to each
+line:
+
+<pre>
+{% highlight ruby linenos %}
+def foo
+  puts 'foo'
+end
+{% endhighlight %}
+</pre>
+
 In order for the highlighting to show up, you'll need to include a
 highlighting stylesheet. For an example stylesheet you can look at
 "syntax.css":http://github.com/mojombo/tpw/tree/master/css/syntax.css. These
 are the same styles as used by GitHub and you are free to use them for your
-own site.
+own site. If you use linenos, you might want to include an additional CSS
+class definition for <code>lineno</code> in syntax.css to distinguish the line
+numbers from the highlighted code.
 
 h2. Categories
 
-Posts are placed into categories based on the directory structure they are found
-within (see above for an example). The categories can be accessed from within
-a Liquid template as follows:
+Posts are placed into categories based on the directory structure they are
+found within (see above for an example). The categories can be accessed from
+within a Liquid template as follows:
 
 <pre>
 {% for post in site.categories.foo %}
@@ -353,25 +380,6 @@ This would list all the posts in the category 'foo' by date and title.
 
 The posts within each category are sorted in reverse chronological order.
 
-h2. Contribute
-
-If you'd like to hack on Jekyll, grab the source from GitHub. To get
-all of the dependencies, install the gem first.
-
-  $ git clone git://github.com/mojombo/jekyll
-
-The best way to get your changes merged back into core is as follows:
-
-# Fork mojombo/jekyll on GitHub
-# Clone down your fork
-# Create a topic branch to contain your change
-# Hack away
-# If you are adding new functionality, document it in README.textile
-# Do not change the version number, I will do that on my end
-# If necessary, rebase your commits into logical chunks, without errors
-# Push the branch up to GitHub
-# Send me (mojombo) a pull request for your branch
-
 h2. Blog migrations
 
 h3. Movable Type
@@ -409,6 +417,38 @@ This code also has only been tested with Typo version 4+. Previous versions
 of Typo may not convert correctly. Please check the results and verify the 
 posts before publishing.
 
+h3. TextPattern 4
+
+To migrate your TextPattern blog into Jekyll, you'll need read access to the MySQL
+database. The lib/jekyll/converters/textpattern.rb module provides a simple convert to create .textile files in a _posts directory based on 
+the entries contained therein.
+
+  $ ruby -r './lib/jekyll/converters/textpattern' -e 'Jekyll::TextPattern.process( \
+    "database_name", "username", "password", "hostname")'
+
+The hostname defaults to _localhost_, all other variables are needed
+You may need to adjust the code used to filter entries. Left alone,
+it will attempt to pull all entries that are live or sticky.
+
+h2. Contribute
+
+If you'd like to hack on Jekyll, start by forking my repo on GitHub:
+
+http://github.com/mojombo/jekyll
+
+To get all of the dependencies, install the gem first. The best way to get
+your changes merged back into core is as follows:
+
+# Clone down your fork
+# Create a topic branch to contain your change
+# Hack away
+# Add tests and make sure everything still passes by running `rake`
+# If you are adding new functionality, document it in README.textile
+# Do not change the version number, I will do that on my end
+# If necessary, rebase your commits into logical chunks, without errors
+# Push the branch up to GitHub
+# Send me (mojombo) a pull request for your branch
+
 h2. License
 
 (The MIT License)

data/VERSION.yml

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

data/bin/jekyll

@@ -47,6 +47,15 @@ opts = OptionParser.new do |opts|
       puts 'You must have the rdiscount gem installed first'
     end
   end
+  
+  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/mephisto.rb

@@ -1,7 +1,19 @@
+# Quickly hacked together my Michael Ivey
+# Based on mt.rb by Nick Gerakines, open source and publically
+# available under the MIT license. Use this module at your own risk.
+
 require 'rubygems'
+require 'sequel'
 require 'fastercsv'
 require 'fileutils'
 require File.join(File.dirname(__FILE__),"csv.rb")
+
+# NOTE: This converter requires Sequel and the MySQL gems.
+# The MySQL gem can be difficult to install on OS X. Once you have MySQL
+# installed, running the following commands should work:
+# $ sudo gem install sequel
+# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+ 
 module Jekyll
   module Mephisto
     #Accepts a hash with database config variables, exports mephisto posts into a csv
@@ -20,5 +32,48 @@ module Jekyll
       `#{command}`
       CSV.process
     end
+
+    # This query will pull blog posts from all entries across all blogs. If
+    # you've got unpublished, deleted or otherwise hidden posts please sift
+    # through the created posts to make sure nothing is accidently published.
+
+    QUERY = "SELECT id, permalink, body, published_at, title FROM contents WHERE user_id = 1 AND type = 'Article' AND published_at IS NOT NULL ORDER BY published_at"
+ 
+    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|
+        title = post[:title]
+        slug = post[:permalink]
+        date = post[:published_at]
+        content = post[:body]
+#         more_content = ''
+        
+        # Be sure to include the body and extended body.
+#         if more_content != nil
+#           content = content + " \n" + more_content
+#         end
+        
+        # Ideally, this script would determine the post format (markdown, html
+        # , etc) and create files with proper extensions. At this point it
+        # just assumes that markdown will be acceptable.
+        name = [date.year, date.month, date.day, slug].join('-') + ".markdown"
+
+        data = {
+           'layout' => 'post',
+           'title' => title.to_s,
+           'mt_id' => post[:entry_id],
+         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
+ 
+        File.open("_posts/#{name}", "w") do |f|
+          f.puts data
+          f.puts "---"
+          f.puts content
+        end
+      end
+ 
+    end
   end
-end
+end

data/lib/jekyll/converters/textpattern.rb

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'sequel'
+require 'fileutils'
+
+# NOTE: This converter requires Sequel and the MySQL gems.
+# The MySQL gem can be difficult to install on OS X. Once you have MySQL
+# installed, running the following commands should work:
+# $ sudo gem install sequel
+# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+
+module Jekyll
+  module TextPattern
+    # Reads a MySQL database via Sequel and creates a post file for each post.
+    # The only posts selected are those with a status of 4 or 5, which means "live"
+    # and "sticky" respectively.
+    # Other statuses is 1 => draft, 2 => hidden and 3 => pending
+    QUERY = "select Title, url_title, Posted, Body, Keywords from textpattern where Status = '4' or Status = '5'"
+
+    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[:Title]
+        slug = post[:url_title]
+        date = post[:Posted]
+        content = post[:Body]
+        
+        name = [date.strftime("%Y-%m-%d"), slug].join('-') + ".textile"
+
+        # Get the relevant fields as a hash, delete empty fields and convert
+        # to YAML for the header        
+        data = {
+           'layout' => 'post',
+           'title' => title.to_s,
+           'tags' => post[:Keywords].split(',')
+         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
+
+        # Write out the data and content to file
+        File.open("_posts/#{name}", "w") do |f|
+          f.puts data
+          f.puts "---"
+          f.puts content
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/converters/typo.rb

@@ -0,0 +1,49 @@
+# Author: Toby DiPasquale <toby@cbcg.net>
+require 'fileutils'
+require 'rubygems'
+require 'sequel'
+ 
+module Jekyll
+  module Typo
+    # this SQL *should* work for both MySQL and PostgreSQL, but I haven't 
+    # tested PostgreSQL yet (as of 2008-12-16)
+    SQL = <<-EOS
+    SELECT c.id id,
+           c.title title, 
+           c.permalink slug, 
+           c.body body,
+           c.published_at date, 
+           c.state state,
+           COALESCE(tf.name, 'html') filter
+      FROM contents c 
+           LEFT OUTER JOIN text_filters tf
+                        ON c.text_filter_id = tf.id 
+    EOS
+
+    def self.process dbname, user, pass, host='localhost'
+      FileUtils.mkdir_p '_posts'
+      db = Sequel.mysql dbname, :user => user, :password => pass, :host => host
+      db[SQL].each do |post|
+        next unless post[:state] =~ /Published/
+
+        name = [ sprintf("%.04d", post[:date].year),
+                 sprintf("%.02d", post[:date].month),
+                 sprintf("%.02d", post[:date].day),
+                 post[:slug].strip ].join('-')
+        # Can have more than one text filter in this field, but we just want 
+        # the first one for this
+        name += '.' + post[:filter].split(' ')[0]
+
+        File.open("_posts/#{name}", 'w') do |f|
+          f.puts({ 'layout'   => 'post',
+                   'title'    => post[:title].to_s,
+                   'typo_id'  => post[:id]
+                 }.delete_if { |k, v| v.nil? || v == '' }.to_yaml)
+          f.puts '---'
+          f.puts post[:body].delete("\r")
+        end
+      end
+    end
+
+  end   # module Typo
+end   # module Jekyll

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/convertible.rb

@@ -24,16 +24,26 @@ module Jekyll
     #
     # Returns nothing
     def transform
-      case self.ext[1..-1]
-      when /textile/i
+      case Jekyll.content_type
+      when :textile
         self.ext = ".html"
         self.content = RedCloth.new(self.content).to_html
-      when /markdown/i, /mkdn/i, /md/i
+      when :markdown
         self.ext = ".html"
         self.content = Jekyll.markdown_proc.call(self.content)
       end
     end
     
+    def determine_content_type
+      case self.ext[1..-1]
+      when /textile/i
+        return :textile
+      when /markdown/i, /mkdn/i, /md/i
+        return :markdown
+      end      
+      return :unknown
+    end
+    
     # Add any necessary layouts to this convertible document
     #   +layouts+ is a Hash of {"name" => "layout"}
     #   +site_payload+ is the site payload hash
@@ -41,6 +51,7 @@ module Jekyll
     # Returns nothing
     def do_layout(payload, layouts)
       # render and transform content (this becomes the final content of the object)
+      Jekyll.content_type = self.determine_content_type
       self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters])
       self.transform
       

data/lib/jekyll/post.rb

@@ -18,7 +18,7 @@ module Jekyll
       name =~ MATCHER
     end
     
-    attr_accessor :date, :slug, :ext, :categories, :topics
+    attr_accessor :date, :slug, :ext, :categories, :topics, :published
     attr_accessor :data, :content, :output
     
     # Initialize this Post instance.
@@ -38,6 +38,20 @@ module Jekyll
       
       self.process(name)
       self.read_yaml(@base, name)
+
+			if self.data.has_key?('published') && self.data['published'] == false
+				self.published = false
+			else
+				self.published = true
+			end
+      
+      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
+        end
+      end
     end
     
     # Spaceship is based on Post#date
@@ -61,15 +75,19 @@ module Jekyll
     # The generated directory into which the post will be placed
     # upon generation. This is derived from the permalink or, if
     # permalink is absent, set to the default date
-    # e.g. "/2008/11/05/"
+    # e.g. "/2008/11/05/" if the permalink style is :date, otherwise nothing
     #
     # Returns <String>
     def dir
       if permalink
-        permalink.to_s.split("/")[0..-2].join("/")
+        permalink.to_s.split("/")[0..-2].join("/") + '/'
       else
         prefix = self.categories.empty? ? '' : '/' + self.categories.join('/')
-        prefix + date.strftime("/%Y/%m/%d/")
+        if Jekyll.permalink_style == :date
+          prefix + date.strftime("/%Y/%m/%d/")
+        else
+          prefix + '/'
+        end
       end
     end
     
@@ -87,7 +105,7 @@ module Jekyll
     #
     # Returns <String>
     def url
-      self.dir + self.slug + ".html"
+      permalink || self.dir + self.slug + ".html"
     end
     
     # The UID for this post (useful in feeds)

data/lib/jekyll/site.rb

@@ -2,7 +2,7 @@ module Jekyll
   
   class Site
     attr_accessor :source, :dest
-    attr_accessor :layouts, :posts
+    attr_accessor :layouts, :posts, :categories
     
     # Initialize the site
     #   +source+ is String path to the source directory containing
@@ -16,6 +16,7 @@ module Jekyll
       self.dest = dest
       self.layouts = {}
       self.posts = []
+      self.categories = Hash.new { |hash, key| hash[key] = Array.new }
     end
     
     # Do the actual work of processing the site and generating the
@@ -62,7 +63,11 @@ module Jekyll
       entries.each do |f|
         if Post.valid?(f)
           post = Post.new(self.source, dir, f)
-          self.posts << post
+
+          if post.published
+            self.posts << post
+            post.categories.each { |c| self.categories[c] << post }
+          end
         end
       end
       
@@ -72,6 +77,7 @@ module Jekyll
       end
       
       self.posts.sort!
+      self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
@@ -88,7 +94,8 @@ module Jekyll
     # Copy all regular files from <source> to <dest>/ ignoring
     # any files/directories that are hidden or backup files (start
     # with "." or end with "~") or contain site content (start with "_")
-    # unless they are "_posts" directories
+    # unless they are "_posts" directories or web server files such as
+    # '.htaccess'
     #   The +dir+ String is a relative path used to call this method
     #            recursively as it descends through directories
     #
@@ -98,8 +105,10 @@ module Jekyll
       entries = Dir.entries(base)
       entries = entries.reject { |e| e[-1..-1] == '~' }
       entries = entries.reject do |e|
-        (e != '_posts') and ['.', '_'].include?(e[0..0])
+        (e != '_posts') and ['.', '_'].include?(e[0..0]) unless ['.htaccess'].include?(e)
       end
+      directories = entries.select { |e| File.directory?(File.join(base, e)) }
+      files = entries.reject { |e| File.directory?(File.join(base, e)) }
 
       # we need to make sure to process _posts *first* otherwise they 
       # might not be available yet to other templates as {{ site.posts }}
@@ -107,23 +116,24 @@ module Jekyll
         entries.delete('_posts')
         read_posts(dir)
       end
-
-      entries.each do |f|
-        if File.directory?(File.join(base, f))
-          next if self.dest.sub(/\/$/, '') == File.join(base, f)
-          transform_pages(File.join(dir, f))
-        else
-          first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
-
-          if first3 == "---"
-            # file appears to have a YAML header so process it as a page
-            page = Page.new(self.source, dir, f)
-            page.render(self.layouts, site_payload)
-            page.write(self.dest)
+      [directories, files].each do |entries|
+        entries.each do |f|
+          if File.directory?(File.join(base, f))
+            next if self.dest.sub(/\/$/, '') == File.join(base, f)
+            transform_pages(File.join(dir, f))
           else
-            # otherwise copy the file without transforming it
-            FileUtils.mkdir_p(File.join(self.dest, dir))
-            FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
+            first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
+        
+            if first3 == "---"
+              # file appears to have a YAML header so process it as a page
+              page = Page.new(self.source, dir, f)
+              page.render(self.layouts, site_payload)
+              page.write(self.dest)
+            else
+              # otherwise copy the file without transforming it
+              FileUtils.mkdir_p(File.join(self.dest, dir))
+              FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
+            end
           end
         end
       end

data/lib/jekyll/tags/highlight.rb

@@ -2,10 +2,22 @@ module Jekyll
   
   class HighlightBlock < Liquid::Block
     include Liquid::StandardFilters
+    # we need a language, but the linenos argument is optional.
+    SYNTAX = /(\w+)\s?(:?linenos)?\s?/
     
-    def initialize(tag_name, lang, tokens)
+    def initialize(tag_name, markup, tokens)
       super
-      @lang = lang.strip
+      if markup =~ SYNTAX
+        @lang = $1
+        if defined? $2
+          # additional options to pass to Albino.
+          @options = { 'O' => 'linenos=inline' }
+        else
+          @options = {}
+        end
+      else
+        raise SyntaxError.new("Syntax Error in 'highlight' - Valid syntax: highlight <lang> [linenos]")
+      end
     end
   
     def render(context)
@@ -17,7 +29,11 @@ module Jekyll
     end
     
     def render_pygments(context, code)
-      "<notextile>" + Albino.new(code, @lang).to_s + "</notextile>"
+      if Jekyll.content_type == :markdown
+        return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
+      else
+        "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
+      end
     end
     
     def render_codehighlighter(context, code)
@@ -34,4 +50,4 @@ module Jekyll
   
 end
 
-Liquid::Template.register_tag('highlight', Jekyll::HighlightBlock)
+Liquid::Template.register_tag('highlight', Jekyll::HighlightBlock)

data/lib/jekyll.rb

@@ -43,15 +43,14 @@ require 'jekyll/tags/include'
 require 'jekyll/albino'
 
 module Jekyll
-  VERSION = '0.3.0'
-  
   class << self
-    attr_accessor :source, :dest, :lsi, :pygments, :markdown_proc
+    attr_accessor :source, :dest, :lsi, :pygments, :markdown_proc, :content_type, :permalink_style
   end
   
   Jekyll.lsi = false
   Jekyll.pygments = false
   Jekyll.markdown_proc = Proc.new { |x| Maruku.new(x).to_html }
+  Jekyll.permalink_style = :date
   
   def self.process(source, dest)
     require 'classifier' if Jekyll.lsi
@@ -60,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/helper.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 
 require 'test/unit'
+require 'redgreen'
 
 include Jekyll
 
@@ -10,4 +11,4 @@ end
 
 def clear_dest
   FileUtils.rm_rf(dest_dir)
-end
+end

data/test/source/category/_posts/2008-9-23-categories.textile

@@ -0,0 +1,6 @@
+---
+layout: default
+title: Categories
+---
+
+Categories _should_ work

data/test/source/foo/_posts/bar/2008-12-12-topical-post.textile

@@ -0,0 +1,8 @@
+---
+layout: default
+title: Topical Post
+---
+
+h1. {{ page.title }}
+
+This post has a topic.

data/test/source/z_category/_posts/2008-9-23-categories.textile

@@ -0,0 +1,6 @@
+---
+layout: default
+title: Categories
+---
+
+Categories _should_ work. Even if ordered after index.

data/test/test_filters.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestFilters < Test::Unit::TestCase
+  
+  class JekyllFilter
+    include Jekyll::Filters
+  end
+  
+  def setup
+    @filter = JekyllFilter.new
+  end
+
+  def test_array_to_sentence_string_with_no_args
+    assert_equal "", @filter.array_to_sentence_string([])
+  end
+
+  def test_array_to_sentence_string_with_one_arg
+    assert_equal "1", @filter.array_to_sentence_string([1])
+    assert_equal "chunky", @filter.array_to_sentence_string(["chunky"])
+  end
+  
+  def test_array_to_sentence_string_with_two_args
+    assert_equal "1 and 2", @filter.array_to_sentence_string([1, 2])
+    assert_equal "chunky and bacon", @filter.array_to_sentence_string(["chunky", "bacon"])
+  end
+  
+  def test_array_to_sentence_string_with_multiple_args
+    assert_equal "1, 2, 3, and 4", @filter.array_to_sentence_string([1, 2, 3, 4])
+    assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"])
+  end
+  
+  def test_xml_escape_with_ampersands
+    assert_equal "AT&amp;T", @filter.xml_escape("AT&T")
+    assert_equal "&lt;code&gt;command &amp;lt;filename&amp;gt;&lt;/code&gt;", @filter.xml_escape("<code>command &lt;filename&gt;</code>")
+  end
+  
+end

data/test/test_generated_site.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/helper'
 class TestGeneratedSite < Test::Unit::TestCase
   def setup
     clear_dest
-    source = File.join(File.dirname(__FILE__), *%w[source])
-    @s = Site.new(source, dest_dir)
+    @source = File.join(File.dirname(__FILE__), *%w[source])
+    @s = Site.new(@source, dest_dir)
     @s.process
     @index = File.read(File.join(dest_dir, 'index.html'))
   end
@@ -16,6 +16,17 @@ class TestGeneratedSite < Test::Unit::TestCase
 
   def test_post_content_in_index
     # confirm that the {{ post.content }} is rendered OK
-    assert @index.include?('<p>This <em>is</em> cool</p>')
+    latest_post = Dir[File.join(@source, '_posts/*')].last
+    post = Post.new(@source, '', File.basename(latest_post))
+    Jekyll.content_type = post.determine_content_type
+    post.transform
+    assert @index.include?(post.content)
+  end
+
+  def test_unpublished_posts_are_hidden
+    published = Dir[File.join(dest_dir, 'publish_test/2008/02/02/*.html')].map {|f| File.basename(f)}
+    
+    assert_equal 1, published.size
+    assert_equal "published.html", published.first
   end
 end

data/test/test_post.rb

@@ -43,7 +43,15 @@ class TestPost < Test::Unit::TestCase
     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
+    assert_equal "my_category/", p.dir
+  end
+  
+  def test_url_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/permalinked-post", p.url
   end
 
   def test_read_yaml
@@ -62,6 +70,28 @@ class TestPost < Test::Unit::TestCase
     
     assert_equal "<h1>{{ page.title }}</h1>\n<p>Best <strong>post</strong> ever</p>", p.content
   end
+
+  def test_published
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '',  "2008-02-02-published.textile")
+		assert_equal true, p.published
+  end
+
+  def test_not_published
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '',  "2008-02-02-not-published.textile")
+		assert_equal false, p.published
+  end
+
+  def test_yaml_category
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '',  "2009-01-27-category.textile")
+    assert p.categories.include?('foo')
+  end
+
+  def test_yaml_categories
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '',  "2009-01-27-categories.textile")
+    assert p.categories.include?('foo')
+    assert p.categories.include?('bar')
+    assert p.categories.include?('baz')
+  end
   
   def test_render
     p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '',  "2008-10-18-foo-bar.textile")
@@ -88,6 +118,12 @@ class TestPost < Test::Unit::TestCase
     assert_equal "<<< <p>url: /2008/11/21/complex.html<br />\ndate: #{Time.parse("2008-11-21")}<br />\nid: /2008/11/21/complex</p> >>>", p.output
   end
   
+  def test_categories_and_topics
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.textile')
+    assert_equal ['foo'], p.categories
+    assert_equal ['bar'], p.topics
+  end    
+  
   def test_include
     Jekyll.source = File.join(File.dirname(__FILE__), *%w[source])
     p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-12-13-include.markdown")
@@ -96,4 +132,4 @@ class TestPost < Test::Unit::TestCase
     
     assert_equal "<<< <hr />\n<p>Tom Preston-Werner github.com/mojombo</p>\n\n<p>This <em>is</em> cool</p> >>>", p.output
   end
-end
+end

data/test/test_site.rb

@@ -2,8 +2,8 @@ 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)
+    @source = File.join(File.dirname(__FILE__), *%w[source])
+    @s = Site.new(@source, dest_dir)
   end
   
   def test_site_init
@@ -18,13 +18,19 @@ class TestSite < Test::Unit::TestCase
  
   def test_read_posts
     @s.read_posts('')
-    
-    assert_equal 4, @s.posts.size
+    posts = Dir[File.join(@source, '_posts/*')]
+    assert_equal posts.size - 1, @s.posts.size
   end
   
-  def test_write_posts
+  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 3, @s.categories['foo'].size
   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: qrush-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.3.0.1
+  version: 0.4.0
 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: jekyll
+date: 2009-02-03 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 4.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.9.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: classifier
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: maruku
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
@@ -55,7 +55,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -64,39 +64,29 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.6
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  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
@@ -105,29 +95,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 
@@ -149,8 +201,5 @@ rubygems_version: 1.2.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,38 +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/typo.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_filters.rb
-test/test_generated_site.rb
-test/test_jekyll.rb
-test/test_post.rb
-test/test_site.rb

data/Rakefile

@@ -1,29 +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
-  desc "Migrate from Movable Type in the current directory"
-  task :mt do
-    sh %q(ruby -r './lib/jekyll/converters/mt' -e 'Jekyll::MT.process("#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")')
-  end
-  desc "Migrate from Typo in the current directory"
-  task :typo do
-    sh %q(ruby -r './lib/jekyll/converters/typo' -e 'Jekyll::Typo.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.1"
-
-  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