octopress-ink 1.0.0.rc.55 → 1.0.0.rc.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f517835b210f170331ea8cd934bf152e3c3ad1c2
-  data.tar.gz: ae3be19c27549ace16b73f659d18d18035da7ea2
+  metadata.gz: a2cd9fc670733acf85a2404920d6007bef790fc6
+  data.tar.gz: f1b1aa10dc93141d6a1d33015c9d489795bf3e6f
 SHA512:
-  metadata.gz: 03d00856c6ca3b2ad4c3d95e098caeaa5ee12dfe7267efb4257f0fcc67e3fab4a1aeed9bda25390cdecb4777a791aba6018ce5650e725dd27cdceb9e96b26ee9
-  data.tar.gz: 0257488cc68a4a887e2f44e9044e6ac8fdfd261f55a78334486f591686ddbf2dd3ed2b3cb110da7c1d9a995caaad76c9c48631cb762b27dc6fdabbf1292c78fd
+  metadata.gz: 1eed8707847bc8d7905fa504d057eafbf8e2da7e35e77500ec24610d3e22a1483a12cfb292407948b5f9bbff46448c1dd16c444f926a1ae47b52b2688525e5db
+  data.tar.gz: 89ecd6438d235a217b22372422a0e6e137986067ec0334f6b6415e6756557cdd211e8afe33ab8b146c73e39597479282bb1e2a4cc3ea0729a2f6916983a8cd6d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### 1.0.0 RC56 - 2015-03-22
+- Fix: Tag links and lists weren't being ouput
+- Fix: Tags and categories would throw errors if tags were used but plugin
+  didn't have tag/category templates installed.
+- Change: tag names:
+  from {% tags %} -> {% tag_links %}
+  from {% categories %} -> {% category_links %}
+
 ### 1.0.0 RC55 - 2015-03-14
 - Added `ink_watch` site configuration, allowing plugin authors to add their plugin assets directory to Jekyll's watch list.
 

data/lib/octopress-ink.rb

@@ -241,9 +241,9 @@ end
 
 Liquid::Template.register_tag('css_asset_tag', Octopress::Ink::Tags::StylesheetTag)
 Liquid::Template.register_tag('js_asset_tag', Octopress::Ink::Tags::JavascriptTag)
-Liquid::Template.register_tag('categories', Octopress::Ink::Tags::CategoryTag)
+Liquid::Template.register_tag('category_links', Octopress::Ink::Tags::CategoryTag)
 Liquid::Template.register_tag('category_list', Octopress::Ink::Tags::CategoryTag)
-Liquid::Template.register_tag('tags', Octopress::Ink::Tags::CategoryTag)
+Liquid::Template.register_tag('tag_links', Octopress::Ink::Tags::CategoryTag)
 Liquid::Template.register_tag('tag_list', Octopress::Ink::Tags::CategoryTag)
 Liquid::Template.register_tag('feeds', Octopress::Ink::Tags::FeedsTag)
 Liquid::Template.register_tag('feed_updated', Octopress::Ink::Tags::FeedUpdatedTag)

data/lib/octopress-ink/plugin/bootstrap.rb

@@ -27,7 +27,7 @@ module Octopress
           @categories[category]
         end
 
-        def tag(category, lang)
+        def tag(tag, lang)
           tag = "#{tag}_#{page.lang}" if Octopress.multilingual? && page.lang 
           @tags[tag]
         end

data/lib/octopress-ink/tags/category_tag.rb

@@ -13,27 +13,22 @@ module Octopress
         def render(context)
           @context = context
 
-
-          # If no input is passed, render in context of current page
-          # This allows the tag to be used without input on post templates
-          # But in a page loop it should be told passed the post item
-          #
-
-          page = context[@input] || context['page']
+          # Check to see if post loop is active, otherwise default to current page
+          page = context['post'] || context['page']
           items = page[item_name_plural]
 
           return '' if items.nil? || items.empty?
 
-          items = items.sort.map do |item|
-            link = item_link(page, item)
-
+          items = items.sort.map { |i| item_link(page, i) }.compact.map do |link|
             if item_list?
-              link = %Q{<li class="#{item_type}-list-item">#{link}</li>}
+              link = %Q{<li class="#{item_name}-list-item">#{link}</li>}
             end
 
             link
           end
 
+          return '' if items.empty?
+
           if item_list?
             %Q{<ul class="#{item_name}-list">#{items.join}</ul>}
           else
@@ -54,9 +49,10 @@ module Octopress
         end
 
         def item_link(page, item)
-          dir = Bootstrap.send(item_name, item, page['lang'])
-          path = File.join(@context['site']['baseurl'], dir)
-          %Q{<a class="#{item_name}-link" href="#{path}">#{item.capitalize}</a>}
+          if dir = Bootstrap.send(item_name, item, page['lang'])
+            path = File.join(@context['site']['baseurl'] || '', dir)
+            %Q{<a class="#{item_name}-link" href="#{path}">#{item.capitalize}</a>}
+          end
         end
       end
     end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.55"
+    VERSION = "1.0.0.rc.56"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.55
+  version: 1.0.0.rc.56
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll