codeslinger-jekyll 0.5.0 → 0.5.1

data/lib/jekyll/page.rb

@@ -46,18 +46,21 @@ 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
       end
 
-      path = File.join(dest, @dir, name)
+      path = File.join(dest, name)
       File.open(path, 'w') do |f|
         f.write(self.output)
       end

data/lib/jekyll/post.rb

@@ -18,9 +18,12 @@ module Jekyll
       name =~ MATCHER
     end
 
-    attr_accessor :site
-    attr_accessor :date, :slug, :ext, :categories, :topics, :published
-    attr_accessor :data, :content, :output
+    attr_accessor :site, :date, :slug, :ext, :topics, :published, :data, :content, :output
+    attr_writer :categories
+
+    def categories
+      @categories ||= []
+    end
 
     # Initialize this Post instance.
     #   +site+ is the Site
@@ -88,16 +91,7 @@ module Jekyll
     #
     # Returns <String>
     def dir
-      if permalink
-        permalink.to_s.split("/")[0..-2].join("/") + '/'
-      else
-        prefix = self.categories.empty? ? '' : '/' + self.categories.join('/')
-        if [:date, :pretty].include?(self.site.permalink_style)
-          prefix + date.strftime("/%Y/%m/%d/")
-        else
-          prefix + '/'
-        end
-      end
+      File.dirname(url)
     end
 
     # The full path and filename of the post.
@@ -109,13 +103,35 @@ module Jekyll
       self.data && self.data['permalink']
     end
 
+    def template
+      case self.site.permalink_style
+      when :pretty
+        "/:categories/:year/:month/:day/:title"
+      when :none
+        "/:categories/:title.html"
+      when :date
+        "/:categories/:year/:month/:day/:title.html"
+      else
+        self.site.permalink_style.to_s
+      end
+    end
+
     # The generated relative url of this post
     # e.g. /2008/11/05/my-awesome-post.html
     #
     # Returns <String>
     def url
-      ext = self.site.permalink_style == :pretty ? '' : '.html'
-      permalink || self.id + ext
+      return permalink if permalink
+
+      @url ||= {
+        "year"       => date.strftime("%Y"),
+        "month"      => date.strftime("%m"),
+        "day"        => date.strftime("%d"),
+        "title"      => CGI.escape(slug),
+        "categories" => categories.sort.join('/')
+      }.inject(template) { |result, token|
+        result.gsub(/:#{token.first}/, token.last)
+      }.gsub(/\/\//, "/")
     end
 
     # The UID for this post (useful in feeds)
@@ -123,7 +139,7 @@ module Jekyll
     #
     # Returns <String>
     def id
-      self.dir + self.slug
+      File.join(self.dir, self.slug)
     end
 
     # Calculate related posts.
@@ -172,9 +188,10 @@ module Jekyll
     def write(dest)
       FileUtils.mkdir_p(File.join(dest, dir))
 
-      path = File.join(dest, self.url)
+      # The url needs to be unescaped in order to preserve the correct filename
+      path = File.join(dest, CGI.unescape(self.url))
 
-      if self.site.permalink_style == :pretty
+      if template[/\.html$/].nil?
         FileUtils.mkdir_p(path)
         path = File.join(path, "index.html")
       end
@@ -194,12 +211,33 @@ module Jekyll
         "id" => self.id,
         "topics" => self.topics,
         "categories" => self.categories,
+        "next" => self.next,
+        "previous" => self.previous,
         "content" => self.content }.deep_merge(self.data)
     end
 
     def inspect
       "<Post: #{self.id}>"
     end
+
+    def next
+      pos = self.site.posts.index(self)
+
+      if pos && pos < self.site.posts.length-1
+        self.site.posts[pos+1]
+      else
+        nil
+      end
+    end
+
+    def previous
+      pos = self.site.posts.index(self)
+      if pos && pos > 0
+        self.site.posts[pos-1]
+      else
+        nil
+      end
+    end
   end
 
 end

data/lib/jekyll/site.rb

@@ -1,7 +1,7 @@
 module Jekyll
 
   class Site
-    attr_accessor :config, :layouts, :posts, :categories
+    attr_accessor :config, :layouts, :posts, :categories, :exclude
     attr_accessor :source, :dest, :lsi, :pygments, :permalink_style
 
     # Initialize the site
@@ -16,6 +16,7 @@ module Jekyll
       self.lsi             = config['lsi']
       self.pygments        = config['pygments']
       self.permalink_style = config['permalink'].to_sym
+      self.exclude         = config['exclude'] || []
 
       self.reset
       self.setup
@@ -41,7 +42,6 @@ module Jekyll
               RDiscount.new(content).to_html
             end
 
-            puts 'Using rdiscount for Markdown'
           rescue LoadError
             puts 'You must have the rdiscount gem installed first'
           end
@@ -130,12 +130,13 @@ module Jekyll
         end
       end
 
+      self.posts.sort!
+
       # second pass renders each post now that full site payload is available
       self.posts.each do |post|
         post.render(self.layouts, site_payload)
       end
 
-      self.posts.sort!
       self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
@@ -171,11 +172,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) }
 
@@ -228,11 +232,34 @@ module Jekyll
     def filter_entries(entries)
       entries = entries.reject do |e|
         unless ['_posts', '.htaccess'].include?(e)
-          # Reject backup/hidden
-          ['.', '_', '#'].include?(e[0..0]) or e[-1..-1] == '~'
+          ['.', '_', '#'].include?(e[0..0]) || e[-1..-1] == '~' || self.exclude.include?(e)
         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 }
+      page = Page.new(self, self.source, dir, file)
+
+      pages = Pager.calculate_pages(all_posts, self.config['paginate'].to_i)
+
+      (1..pages).each do |num_page|
+        pager = Pager.new(self.config, num_page, all_posts, pages)
+
+        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/lib/jekyll/tags/highlight.rb

@@ -30,9 +30,9 @@ module Jekyll
     end
 
     def render_pygments(context, code)
-      if context["content_type"] == :markdown
+      if context["content_type"] == "markdown"
         return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
-      elsif context["content_type"] == :textile
+      elsif context["content_type"] == "textile"
         return "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
       else
         return Albino.new(code, @lang).to_s(@options)

data/lib/jekyll.rb

@@ -16,6 +16,7 @@ require 'redcloth'
 
 # internal requires
 require 'jekyll/core_ext'
+require 'jekyll/pager'
 require 'jekyll/site'
 require 'jekyll/convertible'
 require 'jekyll/layout'
@@ -27,7 +28,7 @@ require 'jekyll/tags/include'
 require 'jekyll/albino'
 
 module Jekyll
-  # Default options. Overriden by values in _config.yaml or command-line opts.
+  # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML)
   DEFAULTS = {
     'auto'         => false,
@@ -61,7 +62,7 @@ module Jekyll
     # then, we need to know where to look for _config.yml
     source = override['source'] || Jekyll::DEFAULTS['source']
 
-    # Get configuration from <source>/_config.yaml
+    # Get configuration from <source>/_config.yml
     config = {}
     config_file = File.join(source, '_config.yml')
     begin

data/test/helper.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+gem 'RedCloth', '= 4.1.0'
+
 require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 
 require 'test/unit'

data/test/source/_posts/2009-03-12-hash-#1.markdown

@@ -0,0 +1,6 @@
+---
+layout: default
+title: Hash #1
+---
+
+Hashes are nice

data/test/test_filters.rb

@@ -37,5 +37,13 @@ class TestFilters < Test::Unit::TestCase
       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
+
+    should "escape space as plus" do
+      assert_equal "my+things", @filter.cgi_escape("my things")
+    end
+
+    should "escape special characters" do
+      assert_equal "hey%21", @filter.cgi_escape("hey!")
+    end
   end
 end

data/test/test_generated_site.rb

@@ -18,7 +18,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "render post.content" do
-      latest_post = Dir[source_dir('_posts', '*')].last
+      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)

data/test/test_post.rb

@@ -25,6 +25,7 @@ class TestPost < Test::Unit::TestCase
       assert !Post.valid?("blah")
     end
 
+
     context "processing posts" do
       setup do
         @post = Post.allocate
@@ -41,6 +42,8 @@ class TestPost < Test::Unit::TestCase
         assert_equal Time.parse("2008-10-19"), @post.date
         assert_equal "foo-bar", @post.slug
         assert_equal ".textile", @post.ext
+        assert_equal "/2008/10/19", @post.dir
+        assert_equal "/2008/10/19/foo-bar", @post.id
       end
 
       should "create url based on date and title" do
@@ -49,16 +52,101 @@ class TestPost < Test::Unit::TestCase
         assert_equal "/2008/10/19/foo-bar.html", @post.url
       end
 
-      should "respect permalink" do
+      should "CGI escape urls" do
+        @post.categories = []
+        @post.process("2009-03-12-hash-#1.markdown")
+        assert_equal "/2009/03/12/hash-%231.html", @post.url
+        assert_equal "/2009/03/12/hash-#1", @post.id
+      end
+
+      should "respect permalink in yaml front matter" do
         file = "2008-12-03-permalinked-post.textile"
         @post.process(file)
         @post.read_yaml(@source, file)
 
         assert_equal "my_category/permalinked-post", @post.permalink
-        assert_equal "my_category/", @post.dir
+        assert_equal "my_category", @post.dir
         assert_equal "my_category/permalinked-post", @post.url
       end
 
+      context "with site wide permalink" do
+        setup do
+          @post.categories = []
+        end
+
+        context "with unspecified (date) style" do
+          setup do
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/2008/10/19/foo-bar.html", @post.url
+          end
+        end
+
+        context "with unspecified (date) style and a category" do
+          setup do
+            @post.categories << "beer"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/beer/2008/10/19/foo-bar.html", @post.url
+          end
+        end
+
+        context "with unspecified (date) style and categories" do
+          setup do
+            @post.categories << "food"
+            @post.categories << "beer"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/beer/food/2008/10/19/foo-bar.html", @post.url
+          end
+        end
+
+        context "with none style" do
+          setup do
+            @post.site.permalink_style = :none
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:title.html", @post.template
+            assert_equal "/foo-bar.html", @post.url
+          end
+        end
+
+        context "with pretty style" do
+          setup do
+            @post.site.permalink_style = :pretty
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title", @post.template
+            assert_equal "/2008/10/19/foo-bar", @post.url
+          end
+        end
+
+        context "with prefix style and no extension" do
+          setup do
+            @post.site.permalink_style = "/prefix/:title"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/prefix/:title", @post.template
+            assert_equal "/prefix/foo-bar", @post.url
+          end
+        end
+      end
+
       should "read yaml front-matter" do
         @post.read_yaml(@source, @real_file)
 
@@ -75,6 +163,32 @@ class TestPost < Test::Unit::TestCase
       end
     end
 
+    context "when in a site" do
+      setup do
+        clear_dest
+        stub(Jekyll).configuration { Jekyll::DEFAULTS }
+        @site = Site.new(Jekyll.configuration)
+        @site.posts = [setup_post('2008-02-02-published.textile'),
+                       setup_post('2009-01-27-categories.textile')]
+      end
+
+      should "have next post" do
+        assert_equal(@site.posts.last, @site.posts.first.next)
+      end
+
+      should "have previous post" do
+        assert_equal(@site.posts.first, @site.posts.last.previous)
+      end
+
+      should "not have previous post if first" do
+        assert_equal(nil, @site.posts.first.previous)
+      end
+
+      should "not have next post if last" do
+        assert_equal(nil, @site.posts.last.next)
+      end
+    end
+
     context "initializing posts" do
       should "publish when published yaml is no specified" do
         post = setup_post("2008-02-02-published.textile")
@@ -118,6 +232,16 @@ class TestPost < Test::Unit::TestCase
           assert File.exists?(File.join(dest_dir, '2008', '10', '18', 'foo-bar.html'))
         end
 
+        should "write properly without html extension" do
+          post = setup_post("2008-10-18-foo-bar.textile")
+          post.site.permalink_style = ":title"
+          do_render(post)
+          post.write(dest_dir)
+
+          assert File.directory?(dest_dir)
+          assert File.exists?(File.join(dest_dir, 'foo-bar', 'index.html'))
+        end
+
         should "insert data" do
           post = setup_post("2008-11-21-complex.textile")
           do_render(post)

data/test/test_site.rb

@@ -53,5 +53,13 @@ class TestSite < Test::Unit::TestCase
       assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
       assert_equal ent2, @site.filter_entries(ent2)
     end
+
+    should "filter entries with exclude" do
+      excludes = %w[README TODO]
+      includes = %w[index.html site.css]
+
+      @site.exclude = excludes
+      assert_equal includes, @site.filter_entries(excludes + includes)
+    end
   end
 end

data/test/test_tags.rb

@@ -1,35 +1,116 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestTags < Test::Unit::TestCase
-  context "tagging" do
-    setup do
-      @content = <<CONTENT
+
+  def create_post(content, override = {}, markdown = true)
+    stub(Jekyll).configuration do
+      Jekyll::DEFAULTS.merge({'pygments' => true}).merge(override)
+    end
+    site = Site.new(Jekyll.configuration)
+    info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
+
+    if markdown
+      payload = {"content_type" => "markdown"}
+    else
+      payload = {"content_type" => "textile"}
+    end
+
+    @result = Liquid::Template.parse(content).render(payload, info)
+
+    if markdown
+      @result = site.markdown(@result)
+    else
+      @result = site.textile(@result)
+    end
+  end
+
+  def fill_post(code, override = {})
+    content = <<CONTENT
 ---
-layout: post
 title: This is a test
-
 ---
+
 This document results in a markdown error with maruku
 
-{% highlight ruby %}
-puts "hi"
+{% highlight text %}
+#{code}
+{% endhighlight %}
+CONTENT
+    create_post(content, override)
+  end
+
+  context "post content has highlight tag" do
+    setup do
+      fill_post("test")
+    end
+
+    should "not cause a markdown error" do
+      assert_no_match /markdown\-html\-error/, @result
+    end
+
+    should "render markdown with pygments line handling" do
+      assert_match %{<pre>test\n</pre>}, @result
+    end
+  end
 
-puts "bye"
+  context "post content has highlight tag with UTF character" do
+    setup do
+      fill_post("Æ")
+    end
+
+    should "render markdown with pygments line handling" do
+      assert_match %{<pre>Æ\n</pre>}, @result
+    end
+  end
+
+  context "simple post with markdown and pre tags" do
+    setup do
+      @content = <<CONTENT
+---
+title: Maruku vs. RDiscount
+---
+
+_FIGHT!_
+
+{% highlight ruby %}
+puts "3..2..1.."
 {% endhighlight %}
 
+*FINISH HIM*
 CONTENT
     end
 
-    should "render markdown with pygments line handling" do
-      stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'pygments' => true})
+    context "using Textile" do
+      setup do
+        create_post(@content, {}, false)
+      end
+
+      # Broken in RedCloth 4.1.9
+      should "not textilize highlight block" do
+        assert_no_match %r{3\.\.2\.\.1\.\.&quot;</span><br />}, @result
+      end
+    end
+
+    context "using Maruku" do
+      setup do
+        create_post(@content)
       end
-      site = Site.new(Jekyll.configuration)
-      info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
 
-      result = Liquid::Template.parse(@content).render({}, info)
-      result = site.markdown(result)
-      assert_no_match(/markdown\-html\-error/,result)
+      should "parse correctly" do
+        assert_match %r{<em>FIGHT!</em>}, @result
+        assert_match %r{<em>FINISH HIM</em>}, @result
+      end
+    end
+
+    context "using RDiscount" do
+      setup do
+        create_post(@content, 'markdown' => 'rdiscount')
+      end
+
+      should "parse correctly" do
+        assert_match %r{<em>FIGHT!</em>}, @result
+        assert_match %r{<em>FINISH HIM</em>}, @result
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: codeslinger-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 -07:00
+date: 2009-05-06 00:00:00 -07:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 4.0.4
+        version: 4.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -116,6 +116,7 @@ files:
 - test/source/_posts/2009-01-27-array-categories.textile
 - test/source/_posts/2009-01-27-categories.textile
 - test/source/_posts/2009-01-27-category.textile
+- test/source/_posts/2009-03-12-hash-#1.markdown
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/css/screen.css
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile