codeslinger-jekyll 0.5.1 → 0.5.2

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
@@ -214,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
@@ -249,13 +252,11 @@ module Jekyll
     #                   "next_page" => <Number> }}
     def paginate_posts(file, dir)
       all_posts = self.posts.sort { |a,b| b <=> a }
-      page = Page.new(self, self.source, dir, file)
-
       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)

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

data/test/test_generated_site.rb

@@ -17,11 +17,8 @@ class TestGeneratedSite < Test::Unit::TestCase
       assert @index.include?("#{@site.posts.size} Posts")
     end
 
-    should "render post.content" do
-      latest_post = Dir[source_dir('_posts', '*')].sort.last
-      post = Post.new(@site, source_dir, '', File.basename(latest_post))
-      post.transform
-      assert @index.include?(post.content)
+    should "render latest post's content" do
+      assert @index.include?(@site.posts.last.content)
     end
 
     should "hide unpublished posts" do
@@ -34,5 +31,10 @@ class TestGeneratedSite < Test::Unit::TestCase
     should "not copy _posts directory" do
       assert !File.exist?(dest_dir('_posts'))
     end
+
+    should "process other static files and generate correct permalinks" do
+      assert File.exists?(dest_dir('/about/index.html'))
+      assert File.exists?(dest_dir('/contacts.html'))
+    end
   end
 end

data/test/test_page.rb

@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestPage < Test::Unit::TestCase
+  def setup_page(file)
+    @page = Page.new(@site, source_dir, '', file)
+  end
+
+  def do_render(page)
+    layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")}
+    page.render(layouts, {"site" => {"posts" => []}})
+  end
+
+  context "A Page" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration { Jekyll::DEFAULTS }
+      @site = Site.new(Jekyll.configuration)
+    end
+    
+    context "processing pages" do
+      should "create url based on filename" do
+        @page = setup_page('contacts.html')
+        assert_equal "/contacts.html", @page.url
+      end
+
+      context "with pretty url style" do
+        setup do
+          @site.permalink_style = :pretty
+        end
+
+        should "return dir correctly" do
+          @page = setup_page('contacts.html')
+          assert_equal '/contacts/', @page.dir
+        end
+
+        should "return dir correctly for index page" do
+          @page = setup_page('index.html')
+          assert_equal '/', @page.dir
+        end
+      end
+
+      context "with any other url style" do
+        should "return dir correctly" do
+          @site.permalink_style = nil
+          @page = setup_page('contacts.html')
+          assert_equal '/', @page.dir
+        end
+      end
+
+      should "respect permalink in yaml front matter" do
+        file = "about.html"
+        @page = setup_page(file)
+
+        assert_equal "/about/", @page.permalink
+        assert_equal @page.permalink, @page.url
+        assert_equal "/about/", @page.dir
+      end
+    end
+
+    context "rendering" do
+      setup do
+        clear_dest
+      end
+      
+      should "write properly" do
+        page = setup_page('contacts.html')
+        do_render(page)
+        page.write(dest_dir)
+
+        assert File.directory?(dest_dir)
+        assert File.exists?(File.join(dest_dir, 'contacts.html'))
+      end
+
+      should "write properly without html extension" do
+        page = setup_page('contacts.html')
+        page.site.permalink_style = :pretty 
+        do_render(page)
+        page.write(dest_dir)
+
+        assert File.directory?(dest_dir)
+        assert File.exists?(File.join(dest_dir, 'contacts', 'index.html'))
+      end
+      
+    end
+
+  end 
+end

data/test/test_pager.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestPager < Test::Unit::TestCase
+  context "pagination enabled" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({
+          'source'      => source_dir, 
+          'destination' => dest_dir,
+          'paginate'    => 2
+        })
+      end
+
+      @config = Jekyll.configuration
+      @site = Site.new(@config)
+      @posts = @site.read_posts('')
+    end
+
+    should "calculate number of pages" do
+      assert_equal(2, Pager.calculate_pages(@posts, @config['paginate']))
+    end
+
+    should "create first pager" do
+      pager = Pager.new(@config, 1, @posts)
+      assert_equal(@config['paginate'].to_i, pager.posts.size)
+      assert_equal(2, pager.total_pages)
+      assert_nil(pager.previous_page)
+      assert_equal(2, pager.next_page)
+    end
+  
+    should "create second pager" do
+      pager = Pager.new(@config, 2, @posts)
+      assert_equal(@posts.size - @config['paginate'].to_i, pager.posts.size)
+      assert_equal(2, pager.total_pages)
+      assert_equal(1, pager.previous_page)
+      assert_nil(pager.next_page)
+    end
+    
+    should "not create third pager" do
+      assert_raise(RuntimeError) { Pager.new(@config, 3, @posts) }
+    end
+    
+    should "report that pagination is enabled" do
+      assert Pager.pagination_enabled?(@config, 'index.html')
+    end
+  end
+end