jekyll-tagging 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 03a01587a551adf47669ffa68399c99d4ee65cbc
-  data.tar.gz: 5ddd9144261b001c6dea775314705c6028170153
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODAwNGU5NzY4ZDU1OGVkZTk2OWNkODFiY2E1Mzg1MGE0NzY1NWEwZA==
+  data.tar.gz: !binary |-
+    MTE4MmNkMjNhZDYzZTY3MDQ2M2JmZWEzZDg3MTdmZTIxZmU2NGU5Nw==
 SHA512:
-  metadata.gz: 240e4046229f6b1faad342901a3306f07fa88e1b496adb6b75931476f24ac0199505b11397f1534511edd4d05668c55ff52f9e458fb1ea9e564e1c7b42da12c1
-  data.tar.gz: 39b7db326f9cf5e0896e8055a03a8681c7da75958e4363e98888b7efaadfd7fcf30183fbfebb05625f88184aabdcda9509abda6d74c5cf8e010eda8e7bbf6c13
+  metadata.gz: !binary |-
+    YmZmNTBjYzVjMmU4ZDJhMTU3NmNiZWU4NWJiOWVkYTVkMjQwNmYwM2FjYmJj
+    NDBmOGM2YWU0NDNlNzJmZTg0MTI1MDkyZjFhN2FmMGM1OTM1ZGYyMGE4NDhi
+    OGU4ZGEzZmM1ZjVhYjMzNzk1ZDAzMGVmMTZjMjU2Zjk2Y2EwMTM=
+  data.tar.gz: !binary |-
+    MjM5OTBjNjdjZDRhODNmNjhmMWFhOWVjYTkxZGI2NDIzN2Q4MjdmOWY5M2Ri
+    MzM2NWEyZmI4M2YxM2ZmNmFmNjc1NGE4Zjc5NmVlYmMzNDBlZTU4MWY1MTU4
+    ZDRmZTgzMjljNDA1OWJjNDVkMDE0MWJiZTIwNTRjYTFmM2E4OWM=

data/ChangeLog

@@ -1,3 +1,8 @@
+== 0.6.0 [2014-09-03]
+
+* Pretty permalinks for tag pages. (Steve Valaitis)
+* Added support for keywords (allenlsy)
+
 == 0.5.0 [2013-06-06]
 
 * Added rel="tag" to posts' tag links. (Brandon Hicks)

data/README.rdoc

@@ -9,6 +9,10 @@ jekyll-tagging is a Jekyll plugin, to add a tag cloud and per tag pages plus fee
 Install it:
 
   gem install jekyll-tagging
+  
+Add this line to your Jekyll project's Gemfile:
+
+  gem 'jekyll-tagging'
 
 Add the following to your <tt>_plugins/ext.rb</tt> file:
 
@@ -28,6 +32,11 @@ You can optionally define a per tag Atom/RSS feed.  In your <tt>_config.yml</tt>
 
 (<tt>tag_page_dir</tt> and <tt>tag_feed_dir</tt> can have the same value.)
 
+=== Pretty page links
+
+If your Jekyll <tt>permalink</tt> configuration is set to something other than <tt>:pretty</tt>, and you still want to have pretty tag links define the following in your <tt>_config.yml</tt>:
+
+  tag_permalink_style: pretty
 
 === Ignoring tags
 

data/Rakefile

@@ -10,6 +10,7 @@ begin
       :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'],
+      :license      => %q{MIT},
       :homepage     => :pattex,
       :dependencies => %w[ruby-nuggets]
     }

data/lib/jekyll/tagging.rb

@@ -32,13 +32,18 @@ module Jekyll
     def new_tag(tag, posts)
       self.class.types.each { |type|
         if layout = site.config["tag_#{type}_layout"]
-          data = { 'layout' => layout, 'posts' => posts.sort.reverse! }
+          data = { 'layout' => layout, 'posts' => posts.sort.reverse!, 'tag' => tag }
 
           name = yield data if block_given?
+          name ||= tag
+
+          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}"
 
           site.pages << TagPage.new(
-            site, site.source, site.config["tag_#{type}_dir"],
-            "#{name || tag}#{site.layouts[data['layout']].ext}", data
+            site, site.source, tag_dir, page_name, data
           )
         end
       }
@@ -71,6 +76,10 @@ module Jekyll
       site.tags.reject { |t| site.config["ignored_tags"].include? t[0] }
     end
 
+    def pretty?
+      @pretty ||= (site.permalink_style == :pretty || site.config['tag_permalink_style'] == 'pretty')
+    end
+
   end
 
   class TagPage < Page
@@ -80,8 +89,6 @@ module Jekyll
       self.data    = data
 
       super(site, base, dir[-1, 1] == '/' ? dir : '/' + dir, name)
-
-      data['tag'] ||= basename
     end
 
     def read_yaml(*)
@@ -105,7 +112,7 @@ module Jekyll
 
     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 ? url : url << '.html'
+      site.permalink_style == :pretty || site.config['tag_permalink_style'] == 'pretty' ? url : url << '.html'
     end
 
     def tags(obj)
@@ -115,6 +122,12 @@ module Jekyll
       tags.join(', ')
     end
 
+    def keywords(obj)
+      return '' if not obj['tags']
+      tags = obj['tags'].dup
+      tags.join(',')  
+    end
+
     def active_tag_data(site = Tagger.site)
       return site.config['tag_data'] unless site.config["ignored_tags"]
       site.config["tag_data"].reject { |tag, set| site.config["ignored_tags"].include? tag }

data/lib/jekyll/tagging/version.rb

@@ -5,7 +5,7 @@ module Jekyll
     module Version
 
       MAJOR = 0
-      MINOR = 5
+      MINOR = 6
       TINY  = 0
 
       class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-tagging
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Arne Eilermann
@@ -9,20 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2014-09-03 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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !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.
@@ -34,39 +62,50 @@ extensions: []
 extra_rdoc_files:
 - ChangeLog
 files:
-- lib/jekyll/tagging.rb
-- lib/jekyll/tagging/version.rb
 - ChangeLog
 - README.rdoc
 - Rakefile
+- lib/jekyll/tagging.rb
+- lib/jekyll/tagging/version.rb
 homepage: http://github.com/pattex/jekyll-tagging
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message: ! '
+
+  jekyll-tagging-0.6.0 [2014-09-03]:
+
+
+  * Pretty permalinks for tag pages. (Steve Valaitis)
+
+  * Added support for keywords (allenlsy)
+
+
+'
 rdoc_options:
+- --title
+- jekyll-tagging Application documentation (v0.6.0)
 - --charset
 - UTF-8
 - --line-numbers
 - --all
-- --title
-- jekyll-tagging Application documentation (v0.5.0)
 - --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.0.3
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Jekyll plugin to automatically generate a tag cloud and tag pages.