mojombo-jekyll 0.5.1 → 0.5.2

data/lib/jekyll/convertible.rb

@@ -17,12 +17,14 @@ module Jekyll
     # Returns nothing
     def read_yaml(base, name)
       self.content = File.read(File.join(base, name))
-
-      if self.content =~ /^(---\s*\n.*?)\n---\s*\n/m
-        self.content = self.content[($1.size + 5)..-1]
-
+      
+      if self.content =~ /^(---\s*\n.*?\n?)(---.*?\n)/m
+        self.content = self.content[($1.size + $2.size)..-1]
+      
         self.data = YAML.load($1)
       end
+      
+      self.data ||= {}
     end
 
     # Transform the contents based on the file extension.

data/lib/jekyll/core_ext.rb

@@ -19,4 +19,12 @@ class Hash
 
     target
   end
-end
+end
+
+# Thanks, ActiveSupport!
+class Date
+  # Converts datetime to an appropriate format for use in XML
+  def xmlschema
+    strftime("%Y-%m-%dT%H:%M:%S%Z")
+  end if RUBY_VERSION < '1.9'
+end

data/lib/jekyll/page.rb

@@ -4,7 +4,7 @@ module Jekyll
     include Convertible
 
     attr_accessor :site
-    attr_accessor :ext
+    attr_accessor :name, :ext, :basename
     attr_accessor :data, :content, :output
 
     # Initialize a new Page.
@@ -17,14 +17,47 @@ module Jekyll
     def initialize(site, base, dir, name)
       @site = site
       @base = base
-      @dir = dir
+      @dir  = dir
       @name = name
 
-      self.data = {}
-
       self.process(name)
       self.read_yaml(File.join(base, dir), name)
-      #self.transform
+    end
+
+    # The generated directory into which the page will be placed
+    # upon generation. This is derived from the permalink or, if
+    # permalink is absent, set to '/'
+    #
+    # Returns <String>
+    def dir
+      url[-1, 1] == '/' ? url : File.dirname(url)
+    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
+
+    def template
+      if self.site.permalink_style == :pretty && !index?
+        "/:name/"
+      else
+        "/:name.html"
+      end
+    end
+
+    # The generated relative url of this page
+    # e.g. /about.html
+    #
+    # Returns <String>
+    def url
+      return permalink if permalink
+
+      @url ||= template.gsub(':name', basename)
     end
 
     # Extract information from the page filename
@@ -33,6 +66,7 @@ module Jekyll
     # Returns nothing
     def process(name)
       self.ext = File.extname(name)
+      self.basename = name.split('.')[0..-2].first
     end
 
     # Add any necessary layouts to this post
@@ -46,22 +80,33 @@ module Jekyll
     end
 
     # Write the generated page file to the destination directory.
-    #   +dest+ is the String path to the destination dir
+    #   +dest_prefix+ is the String path to the destination dir
+    #   +dest_suffix+ is a suffix path to the destination dir
     #
     # Returns nothing
-    def write(dest)
-      FileUtils.mkdir_p(File.join(dest, @dir))
+    def write(dest_prefix, dest_suffix = nil)
+      dest = File.join(dest_prefix, @dir)
+      dest = File.join(dest, dest_suffix) if dest_suffix
+      FileUtils.mkdir_p(dest)
 
-      name = @name
-      if self.ext != ""
-        name = @name.split(".")[0..-2].join('.') + self.ext
+      # The url needs to be unescaped in order to preserve the correct filename
+      path = File.join(dest, CGI.unescape(self.url))
+      if self.url[/\.html$/].nil?
+        FileUtils.mkdir_p(path)
+        path = File.join(path, "index.html")
       end
 
-      path = File.join(dest, @dir, name)
       File.open(path, 'w') do |f|
         f.write(self.output)
       end
     end
+
+    private
+
+      def index?
+        basename == 'index'
+      end
+
   end
 
-end
+end

data/lib/jekyll/pager.rb

@@ -0,0 +1,45 @@
+module Jekyll
+  class Pager
+    attr_reader :page, :per_page, :posts, :total_posts, :total_pages, :previous_page, :next_page
+    
+    def self.calculate_pages(all_posts, per_page)
+      num_pages = all_posts.size / per_page.to_i
+      num_pages.abs + 1 if all_posts.size % per_page.to_i != 0
+      num_pages
+    end
+    
+    def self.pagination_enabled?(config, file)
+      file == 'index.html' && !config['paginate'].nil?
+    end
+    
+    def initialize(config, page, all_posts, num_pages = nil)
+      @page = page
+      @per_page = config['paginate'].to_i
+      @total_pages = num_pages || Pager.calculate_pages(all_posts, @per_page)
+      
+      if @page > @total_pages
+        raise RuntimeError, "page number can't be greater than total pages: #{@page} > #{@total_pages}"
+      end
+      
+      init = (@page - 1) * @per_page
+      offset = (init + @per_page - 1) >= all_posts.size ? all_posts.size : (init + @per_page - 1)
+      
+      @total_posts = all_posts.size
+      @posts = all_posts[init..offset]
+      @previous_page = @page != 1 ? @page - 1 : nil
+      @next_page = @page != @total_pages ? @page + 1 : nil
+    end
+    
+    def to_hash
+      {
+        'page' => page, 
+        'per_page' => per_page, 
+        'posts' => posts, 
+        'total_posts' => total_posts,
+        'total_pages' => total_pages,
+        'previous_page' => previous_page,
+        'next_page' => next_page
+      }
+    end
+  end
+end

data/lib/jekyll/post.rb

@@ -18,7 +18,7 @@ module Jekyll
       name =~ MATCHER
     end
 
-    attr_accessor :site, :date, :slug, :ext, :topics, :published, :data, :content, :output
+    attr_accessor :site, :date, :slug, :ext, :published, :data, :content, :output, :tags
     attr_writer :categories
 
     def categories
@@ -38,10 +38,6 @@ module Jekyll
       @name = name
 
       self.categories = dir.split('/').reject { |x| x.empty? }
-
-      parts = name.split('/')
-      self.topics = parts.size > 1 ? parts[0..-2] : []
-
       self.process(name)
       self.read_yaml(@base, name)
 
@@ -51,6 +47,14 @@ module Jekyll
         self.published = true
       end
 
+      if self.data.has_key?("tag")
+        self.tags = [self.data["tag"]]
+      elsif self.data.has_key?("tags")
+        self.tags = self.data['tags']
+      else
+        self.tags = []
+      end
+
       if self.categories.empty?
         if self.data.has_key?('category')
           self.categories << self.data['category']
@@ -66,11 +70,15 @@ module Jekyll
       end
     end
 
-    # Spaceship is based on Post#date
+    # Spaceship is based on Post#date, slug
     #
     # Returns -1, 0, 1
     def <=>(other)
-      self.date <=> other.date
+      cmp = self.date <=> other.date
+      if 0 == cmp
+       cmp = self.slug <=> other.slug
+      end
+      return cmp
     end
 
     # Extract information from the post filename
@@ -106,7 +114,7 @@ module Jekyll
     def template
       case self.site.permalink_style
       when :pretty
-        "/:categories/:year/:month/:day/:title"
+        "/:categories/:year/:month/:day/:title/"
       when :none
         "/:categories/:title.html"
       when :date
@@ -205,15 +213,15 @@ module Jekyll
     #
     # Returns <Hash>
     def to_liquid
-      { "title" => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '),
-        "url" => self.url,
-        "date" => self.date,
-        "id" => self.id,
-        "topics" => self.topics,
+      { "title"      => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '),
+        "url"        => self.url,
+        "date"       => self.date,
+        "id"         => self.id,
         "categories" => self.categories,
-        "next" => self.next,
-        "previous" => self.previous,
-        "content" => self.content }.deep_merge(self.data)
+        "next"       => self.next,
+        "previous"   => self.previous,
+        "tags"       => self.tags,
+        "content"    => self.content }.deep_merge(self.data)
     end
 
     def inspect

data/lib/jekyll/site.rb

@@ -1,8 +1,8 @@
 module Jekyll
 
   class Site
-    attr_accessor :config, :layouts, :posts, :categories, :exclude
-    attr_accessor :source, :dest, :lsi, :pygments, :permalink_style
+    attr_accessor :config, :layouts, :posts, :categories, :exclude,
+                  :source, :dest, :lsi, :pygments, :permalink_style, :tags
 
     # Initialize the site
     #   +config+ is a Hash containing site configurations details
@@ -25,7 +25,8 @@ module Jekyll
     def reset
       self.layouts         = {}
       self.posts           = []
-      self.categories      = Hash.new { |hash, key| hash[key] = Array.new }
+      self.categories      = Hash.new { |hash, key| hash[key] = [] }
+      self.tags            = Hash.new { |hash, key| hash[key] = [] }
     end
 
     def setup
@@ -76,6 +77,8 @@ module Jekyll
           rescue LoadError
             puts "The maruku gem is required for markdown support!"
           end
+        else
+          raise "Invalid Markdown processor: '#{self.config['markdown']}' -- did you mean 'maruku' or 'rdiscount'?"
       end
     end
 
@@ -126,6 +129,7 @@ module Jekyll
           if post.published
             self.posts << post
             post.categories.each { |c| self.categories[c] << post }
+            post.tags.each { |c| self.tags[c] << post }
           end
         end
       end
@@ -137,7 +141,8 @@ module Jekyll
         post.render(self.layouts, site_payload)
       end
 
-      self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
+      self.categories.values.map { |ps| ps.sort! { |a, b| b <=> a} }
+      self.tags.values.map { |ps| ps.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
@@ -172,11 +177,14 @@ module Jekyll
         directories.delete('_posts')
         read_posts(dir)
       end
+      
       [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))
+          elsif Pager.pagination_enabled?(self.config, f)
+            paginate_posts(f, dir)
           else
             first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
 
@@ -211,15 +219,13 @@ module Jekyll
     #
     # Returns {"site" => {"time" => <Time>,
     #                     "posts" => [<Post>],
-    #                     "categories" => [<Post>],
-    #                     "topics" => [<Post>] }}
+    #                     "categories" => [<Post>]}
     def site_payload
-      {"site" => {
-        "time" => Time.now,
-        "posts" => self.posts.sort { |a,b| b <=> a },
-        "categories" => post_attr_hash('categories'),
-        "topics" => post_attr_hash('topics')
-      }}
+      {"site" => self.config.merge({
+          "time"       => Time.now,
+          "posts"      => self.posts.sort { |a,b| b <=> a },
+          "categories" => post_attr_hash('categories'),
+          "tags"       => post_attr_hash('tags')})}
     end
 
     # Filter out any files/directories that are hidden or backup files (start
@@ -233,5 +239,28 @@ module Jekyll
         end
       end
     end
+
+    # Paginates the blog's posts. Renders the index.html file into paginated directories, ie: page2, page3...
+    # and adds more wite-wide data
+    #
+    # {"paginator" => { "page" => <Number>,
+    #                   "per_page" => <Number>,
+    #                   "posts" => [<Post>],
+    #                   "total_posts" => <Number>,
+    #                   "total_pages" => <Number>,
+    #                   "previous_page" => <Number>,
+    #                   "next_page" => <Number> }}
+    def paginate_posts(file, dir)
+      all_posts = self.posts.sort { |a,b| b <=> a }
+      pages = Pager.calculate_pages(all_posts, self.config['paginate'].to_i)
+      pages += 1
+      (1..pages).each do |num_page|
+        pager = Pager.new(self.config, num_page, all_posts, pages)
+        page = Page.new(self, self.source, dir, file)
+        page.render(self.layouts, site_payload.merge({'paginator' => pager.to_hash}))
+        suffix = "page#{num_page}" if num_page > 1
+        page.write(self.dest, suffix)
+      end
+    end
   end
 end

data/test/helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'RedCloth', '= 4.1.0'
+gem 'RedCloth', '= 4.2.1'
 
 require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 

data/test/source/_posts/2009-05-18-tag.textile

@@ -0,0 +1,6 @@
+---
+title: A Tag
+tag: code
+---
+
+Whoa.

data/test/source/_posts/2009-05-18-tags.textile

@@ -0,0 +1,9 @@
+---
+title: Some Tags
+tags:
+- food
+- cooking
+- pizza
+---
+
+Awesome!

data/test/source/_posts/2009-06-22-empty-yaml.textile

@@ -0,0 +1,3 @@
+---
+---
+Empty YAML.

data/test/source/_posts/2009-06-22-no-yaml.textile

@@ -0,0 +1 @@
+No YAML.

data/test/source/about.html

@@ -0,0 +1,6 @@
+---
+title: About
+permalink: /about/
+---
+
+About the site

data/test/source/contacts.html

@@ -0,0 +1,5 @@
+---
+title: Contact Information
+---
+
+Contact Information

data/test/source/win/_posts/2009-05-24-yaml-linebreak.markdown

@@ -0,0 +1,7 @@
+---
+layout: post
+title: "Test title"
+tag: "Ruby"
+---
+
+This is the content

data/test/test_configuration.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestConfiguration < Test::Unit::TestCase
+  context "loading configuration" do
+    setup do
+      @path = './_config.yml'
+    end
+
+    should "fire warning with no _config.yml" do
+      mock(YAML).load_file(@path) { raise "No such file or directory - #{@path}" }
+      mock(STDERR).puts("WARNING: Could not read configuration. Using defaults (and options).")
+      mock(STDERR).puts("\tNo such file or directory - #{@path}")
+      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+    end
+
+    should "load configuration as hash" do
+      mock(YAML).load_file(@path) { Hash.new }
+      mock(STDOUT).puts("Configuration from #{@path}")
+      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+    end
+
+    should "fire warning with bad config" do
+      mock(YAML).load_file(@path) { Array.new }
+      mock(STDERR).puts("WARNING: Could not read configuration. Using defaults (and options).")
+      mock(STDERR).puts("\tInvalid configuration - #{@path}")
+      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+    end
+  end
+end