jekyll-tagging 0.1.2 → 0.2.0

data/ChangeLog

@@ -1,3 +1,8 @@
+== 0.2.0 [2011-03-10]
+
+* Added support for pretty tag page URLs.
+* Some bugs fixed.
+
 == 0.1.2 [2011-01-31]
 
 * Nothing to do when there are no tags.

data/lib/jekyll/tagging/version.rb

@@ -5,8 +5,8 @@ module Jekyll
     module Version
 
       MAJOR = 0
-      MINOR = 1
-      TINY  = 2
+      MINOR = 2
+      TINY  = 0
 
       class << self
 

data/lib/jekyll/tagging.rb

@@ -7,13 +7,24 @@ module Jekyll
 
     safe true
 
-    DEFAULT_TAG_PAGE_DIR = 'tag'
-
     def generate(site)
-      @tag_page_dir    = site.config['tag_page_dir'] || DEFAULT_TAG_PAGE_DIR
+      unless Tagger.const_defined?(:TAG_PAGE_DIR)
+        Tagger.const_set('TAG_PAGE_DIR', site.config['tag_page_dir'] || 'tag')
+      end
+
       @tag_page_layout = site.config['tag_page_layout']
 
-      generate_tag_pages(site) if @tag_page_layout
+      unless Jekyll::Filters.const_defined?(:PRETTY_URL)
+        Jekyll::Filters.const_set('PRETTY_URL', site.permalink_style == :pretty)
+      end
+
+      if @tag_page_layout
+        generate_tag_pages(site)
+      else
+        $stderr.puts 'WARNING: You have to define a tag_page_layout in ' +
+          'configuration file.'
+      end
+
       site.config.update({ 'tag_data' => calculate_tag_cloud(site) })
     end
 
@@ -22,7 +33,7 @@ module Jekyll
     # to use this.
     def generate_tag_pages(site)
       site.tags.each { |tag, posts|
-        site.pages << new_tag_page(site, site.source, @tag_page_dir, tag, posts.sort.reverse)
+        site.pages << new_tag_page(site, site.source, TAG_PAGE_DIR, tag, posts.sort.reverse)
       }
     end
 
@@ -68,10 +79,8 @@ module Jekyll
   module Filters
 
     def tag_cloud(site)
-      dir = site['tag_page_dir']
-
       site['tag_data'].map { |tag, set|
-        tag_link(tag, tag_url(tag, dir), { :class => "set-#{set}" })
+        tag_link(tag, tag_url(tag), { :class => "set-#{set}" })
       }.join(' ')
     end
 
@@ -82,12 +91,12 @@ module Jekyll
       %Q{<a href="#{url}"#{html_opts}>#{tag}</a>}
     end
 
-    def tag_url(tag, dir = Tagger::DEFAULT_TAG_PAGE_DIR)
-      "/#{dir}/#{ERB::Util.u(tag)}.html"
+    def tag_url(tag)
+      "/#{Tagger::TAG_PAGE_DIR}/#{ERB::Util.u(tag)}#{'.html' unless PRETTY_URL}"
     end
 
     def tags(obj)
-      tags = obj['tags'][0].is_a?(Array) ? obj['tags'].map{ |t| t[0]} : obj['tags']
+      tags = obj['tags'][0].is_a?(Array) ? obj['tags'].map{ |t| t[0] } : obj['tags']
       tags.map { |t| tag_link(t, tag_url(t)) if t.is_a?(String) }.compact.join(', ')
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll-tagging
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Arne Eilermann
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +01:00
+date: 2011-03-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,21 +47,22 @@ files:
 - lib/jekyll/tagging/version.rb
 - lib/jekyll/tagging.rb
 - ChangeLog
-- README.rdoc
 - Rakefile
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/pattex/jekyll-tagging
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --title
-- jekyll-tagging Application documentation (v0.1.2)
-- --inline-source
+- --all
 - --charset
 - UTF-8
-- --all
+- --main
+- ChangeLog
+- --title
+- jekyll-tagging Application documentation (v0.2.0)
+- --line-numbers
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Jekyll plugin to automatically generate a tag cloud and tag pages.