nirvdrum-jekyll 0.6.0 → 0.6.1

data/Rakefile

@@ -6,7 +6,7 @@ begin
   gem 'jeweler', '>= 0.11.0'
   require 'jeweler'
   Jeweler::Tasks.new do |s|
-    s.name = "jekyll"
+    s.name = "nirvdrum-jekyll"
     s.summary = %Q{Jekyll is a simple, blog aware, static site generator.}
     s.email = "tom@mojombo.com"
     s.homepage = "http://github.com/mojombo/jekyll"

data/VERSION.yml

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

data/features/permalinks.feature

@@ -26,11 +26,13 @@ Feature: Fancy permalinks
   Scenario: Use pretty permalink schema for pages
     Given I have an "index.html" page that contains "Totally index"
     And I have an "awesome.html" page that contains "Totally awesome"
+    And I have an "sitemap.xml" page that contains "Totally uhm, sitemap"
     And I have a configuration file with "permalink" set to "pretty"
     When I run jekyll
     Then the _site directory should exist
     And I should see "Totally index" in "_site/index.html"
     And I should see "Totally awesome" in "_site/awesome/index.html"
+    And I should see "Totally uhm, sitemap" in "_site/sitemap.xml"
 
   Scenario: Use custom permalink schema with prefix
     Given I have a _posts directory

data/jekyll.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{jekyll}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-06-28}
+  s.date = %q{2010-02-11}
   s.default_executable = %q{jekyll}
   s.description = %q{Jekyll is a simple, blog aware, static site generator.}
   s.email = %q{tom@mojombo.com}
@@ -76,6 +79,7 @@ Gem::Specification.new do |s|
      "test/source/css/screen.css",
      "test/source/foo/_posts/bar/2008-12-12-topical-post.textile",
      "test/source/index.html",
+     "test/source/sitemap.xml",
      "test/source/win/_posts/2009-05-24-yaml-linebreak.markdown",
      "test/source/z_category/_posts/2008-9-23-categories.textile",
      "test/suite.rb",
@@ -93,7 +97,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{jekyll}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Jekyll is a simple, blog aware, static site generator.}
   s.test_files = [
     "test/helper.rb",
@@ -137,3 +141,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<open4>, [">= 0.9.6"])
   end
 end
+

data/lib/jekyll/page.rb

@@ -57,7 +57,7 @@ module Jekyll
     def url
       return permalink if permalink
 
-      @url ||= template.gsub(':name', basename)
+      @url ||= (ext == '.html') ? template.gsub(':name', basename) : "/#{name}"
     end
 
     # Extract information from the page filename
@@ -91,7 +91,7 @@ module Jekyll
 
       # 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?
+      if self.ext == '.html' && self.url[/\.html$/].nil?
         FileUtils.mkdir_p(path)
         path = File.join(path, "index.html")
       end

data/test/source/sitemap.xml

@@ -0,0 +1,23 @@
+---
+layout: nil
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">	
+  
+  <url>
+		<loc>http://example.com</loc>
+		<lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+		<changefreq>daily</changefreq>
+		<priority>1.0</priority>
+	</url>
+	
+	{% for post in site.posts %}
+	<url>
+		<loc>http://example.com/{{ post.url }}/</loc>
+		<lastmod>{{ site.time }}</lastmod>
+		<changefreq>monthly</changefreq>
+		<priority>0.2</priority>
+	</url>
+	{% endfor %}
+</urlset>

data/test/test_page.rb

@@ -81,6 +81,17 @@ class TestPage < Test::Unit::TestCase
         assert File.exists?(File.join(dest_dir, 'contacts', 'index.html'))
       end
       
+      should "write properly with extension different from html" do
+        page = setup_page("sitemap.xml")
+        page.site.permalink_style = :pretty
+        do_render(page)
+        page.write(dest_dir)
+
+        assert_equal("/sitemap.xml", page.url)
+        assert_nil(page.url[/\.html$/])
+        assert File.directory?(dest_dir)
+        assert File.exists?(File.join(dest_dir,'sitemap.xml'))
+      end
     end
 
   end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nirvdrum-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 -07:00
+date: 2010-02-11 00:00:00 -05:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,6 +142,7 @@ files:
 - test/source/css/screen.css
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
+- test/source/sitemap.xml
 - test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
@@ -154,8 +155,10 @@ files:
 - test/test_site.rb
 - test/test_stylesheet.rb
 - test/test_tags.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/mojombo/jekyll
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -176,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jekyll
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Jekyll is a simple, blog aware, static site generator.