jekyll-tagging 0.6.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODAwNGU5NzY4ZDU1OGVkZTk2OWNkODFiY2E1Mzg1MGE0NzY1NWEwZA==
-  data.tar.gz: !binary |-
-    MTE4MmNkMjNhZDYzZTY3MDQ2M2JmZWEzZDg3MTdmZTIxZmU2NGU5Nw==
+SHA1:
+  metadata.gz: 7948d773271e69433d07f936456e8b12ff09d96f
+  data.tar.gz: 4c80ae7b5bfc2647b41f025b0d1567e45bef99e8
 SHA512:
-  metadata.gz: !binary |-
-    YmZmNTBjYzVjMmU4ZDJhMTU3NmNiZWU4NWJiOWVkYTVkMjQwNmYwM2FjYmJj
-    NDBmOGM2YWU0NDNlNzJmZTg0MTI1MDkyZjFhN2FmMGM1OTM1ZGYyMGE4NDhi
-    OGU4ZGEzZmM1ZjVhYjMzNzk1ZDAzMGVmMTZjMjU2Zjk2Y2EwMTM=
-  data.tar.gz: !binary |-
-    MjM5OTBjNjdjZDRhODNmNjhmMWFhOWVjYTkxZGI2NDIzN2Q4MjdmOWY5M2Ri
-    MzM2NWEyZmI4M2YxM2ZmNmFmNjc1NGE4Zjc5NmVlYmMzNDBlZTU4MWY1MTU4
-    ZDRmZTgzMjljNDA1OWJjNDVkMDE0MWJiZTIwNTRjYTFmM2E4OWM=
+  metadata.gz: ce153677ff32d72527de8c80284d2930197952abb1e13b01e31b86017732418c8b2e460b6cb6e82a5e1f2ee9b6945362dda9604786c58272ee01146eaa02fc91
+  data.tar.gz: 1ca5728dd26133a4c694e810a8574aadac1ee259f74b50b91750560f5a924fed6db10e55ec0cf8c825b70c7e8d4edd1a0044a2d249923e429208b658ba3e837c

data/ChangeLog

@@ -1,3 +1,9 @@
+== 1.0.0 [2015-06-10]
+
+* Generate prettier urls for tag with whitespaces or non ASCII characters. ATTENTION: Your urls may change!
+* Added support for site.config["baseurl"]. (Tsukasa ŌMOTO)
+* Added trailing slashes to permalinks. (Pyry Kontio)
+
 == 0.6.0 [2014-09-03]
 
 * Pretty permalinks for tag pages. (Steve Valaitis)

data/README.rdoc

@@ -1,6 +1,6 @@
 = jekyll-tagging
 
-By Arne Eilermann <mailto:eilermann@lavabit.com> and Jens Wille <mailto:jens.wille@uni-koeln.de>
+By Arne Eilermann <mailto:arne@kleinerdrei.net> and Jens Wille <mailto:jens.wille@uni-koeln.de>
 
 jekyll-tagging is a Jekyll plugin, to add a tag cloud and per tag pages plus feeds to your Jekyll generated Website.
 
@@ -23,7 +23,9 @@ And in your <tt>_config.yml</tt> you have to define your layout used to generate
   tag_page_layout: tag_page
   tag_page_dir: tag
 
-Now you got a new filter called <tt>tag_cloud</tt> which you can use with the <tt>site</tt> object as argument in your layout to get a cloud of all your site's tags. The tags are linked to their related tag page. Furthermore, you got a <tt>tags</tt> filter which you can feed withe a <tt>post</tt> or a <tt>site</tt> object to get a link list of all its tags.
+This will look for <tt>_layouts/tag_page.html</tt>, and use it to generate tag pages into the <tt>_site/tag</tt> directory.
+
+Now you have a new filter called <tt>tag_cloud</tt> which you can use with the <tt>site</tt> object as argument in your layout to get a cloud of all your site's tags. The tags are linked to their related tag page. Furthermore, you have a <tt>tags</tt> filter which you can feed with a <tt>post</tt> or a <tt>site</tt> object to get a link list of all its tags.
 
 You can optionally define a per tag Atom/RSS feed.  In your <tt>_config.yml</tt> define the following:
 
@@ -43,6 +45,8 @@ If your Jekyll <tt>permalink</tt> configuration is set to something other than <
 Sometimes you don't want tag pages generated for certain pages. That's ok! Just add <tt>ignored_tags: [tags,to,ignore]</tt> to your <tt>_config.yml</tt>
 === Example tag page layout
 
+(Save this to <tt>_layouts/tag_page.html</tt> if using the <tt>_config.yml</tt> snippet above.)
+
   ---
   layout: default
   ---

data/Rakefile

@@ -9,7 +9,7 @@ begin
       :version      => Jekyll::Tagging::VERSION,
       :summary      => %q{Jekyll plugin to automatically generate a tag cloud and tag pages.},
       :authors      => ['Arne Eilermann', 'Jens Wille'],
-      :email        => ['eilermann@lavabit.com', 'jens.wille@uni-koeln.de'],
+      :email        => ['arne@kleinerdrei.net', 'jens.wille@uni-koeln.de'],
       :license      => %q{MIT},
       :homepage     => :pattex,
       :dependencies => %w[ruby-nuggets]

data/lib/jekyll/tagging.rb

@@ -1,10 +1,26 @@
 require 'nuggets/range/quantile'
+require 'nuggets/i18n'
 require 'erb'
 
 module Jekyll
 
+  module Helpers
+
+    # call-seq:
+    #   jekyll_tagging_slug(str) => new_str
+    #
+    # Substitutes any diacritics in _str_ with their ASCII equivalents,
+    # whitespaces with dashes and converts _str_ to downcase.
+    def jekyll_tagging_slug(str)
+      str.replace_diacritics.downcase.gsub(/\s/, '-')
+    end
+
+  end
+
   class Tagger < Generator
 
+    include Helpers
+
     safe true
 
     attr_accessor :site
@@ -40,7 +56,7 @@ module Jekyll
           tag_dir = site.config["tag_#{type}_dir"]
           tag_dir = File.join(tag_dir, (pretty? ? name : ''))
 
-          page_name = "#{pretty? ? 'index' : name}#{site.layouts[data['layout']].ext}"
+          page_name = "#{pretty? ? 'index' : jekyll_tagging_slug(name)}#{site.layouts[data['layout']].ext}"
 
           site.pages << TagPage.new(
             site, site.source, tag_dir, page_name, data
@@ -99,6 +115,8 @@ module Jekyll
 
   module Filters
 
+    include Helpers
+
     def tag_cloud(site)
       active_tag_data.map { |tag, set|
         tag_link(tag, tag_url(tag), :class => "set-#{set}")
@@ -111,8 +129,8 @@ module Jekyll
     end
 
     def tag_url(tag, type = :page, site = Tagger.site)
-      url = File.join('', site.config["tag_#{type}_dir"], ERB::Util.u(tag))
-      site.permalink_style == :pretty || site.config['tag_permalink_style'] == 'pretty' ? url : url << '.html'
+      url = File.join('', site.config["baseurl"].to_s, site.config["tag_#{type}_dir"], ERB::Util.u(jekyll_tagging_slug(tag)))
+      site.permalink_style == :pretty || site.config['tag_permalink_style'] == 'pretty' ? url << '/' : url << '.html'
     end
 
     def tags(obj)
@@ -125,7 +143,7 @@ module Jekyll
     def keywords(obj)
       return '' if not obj['tags']
       tags = obj['tags'].dup
-      tags.join(',')  
+      tags.join(',')
     end
 
     def active_tag_data(site = Tagger.site)

data/lib/jekyll/tagging/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-tagging
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Arne Eilermann
@@ -9,53 +9,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Jekyll plugin to automatically generate a tag cloud and tag pages.
 email:
-- eilermann@lavabit.com
+- arne@kleinerdrei.net
 - jens.wille@uni-koeln.de
 executables: []
 extensions: []
@@ -71,41 +77,38 @@ homepage: http://github.com/pattex/jekyll-tagging
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! '
-
-  jekyll-tagging-0.6.0 [2014-09-03]:
-
-
-  * Pretty permalinks for tag pages. (Steve Valaitis)
+post_install_message: |2+
 
-  * Added support for keywords (allenlsy)
+  jekyll-tagging-1.0.0 [2015-06-10]:
 
+  * Generate prettier urls for tag with whitespaces or non ASCII characters. ATTENTION: Your urls may change!
+  * Added support for site.config["baseurl"]. (Tsukasa ŌMOTO)
+  * Added trailing slashes to permalinks. (Pyry Kontio)
 
-'
 rdoc_options:
-- --title
-- jekyll-tagging Application documentation (v0.6.0)
-- --charset
+- "--title"
+- jekyll-tagging Application documentation (v1.0.0)
+- "--charset"
 - UTF-8
-- --line-numbers
-- --all
-- --main
+- "--line-numbers"
+- "--all"
+- "--main"
 - ChangeLog
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Jekyll plugin to automatically generate a tag cloud and tag pages.