octopress-ink 1.0.0.rc.51 → 1.0.0.rc.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70fefc4e7e1779182c223e942a89186c5ff00c57
-  data.tar.gz: 79592ca882f3e6903b3bd7d84043b49f934fa1c3
+  metadata.gz: 8b0ad812b264de8f836e1f5db96b5a39061a619a
+  data.tar.gz: 85d1bbd5246383b33514bc16d265c28ed5314a6a
 SHA512:
-  metadata.gz: 3ba34220f3c7d253d2041860c677c1d0d1decf8a192285ea27c8058059ea01cb1257b326012a22a8e1e1f30883501eedabe684e4f718b9d9a27dbc514580fc73
-  data.tar.gz: ac07ce8413bcd851449bc60e80b836a120b751794fc9d8e4ba72e1a2ae3314a6588d94f9e0f2668126a929d441dcd98b04d57f7d03715d1166396b7daf498563
+  metadata.gz: df00ef2c572101b375e50e1d3ebf2981fbcaec5399b4c32bb0991c8a77bf57d94a0c307f4a0e8fdd9a7a3f90d1ae08a1fd7d47cab297d656d4620b812d028dec
+  data.tar.gz: e351988dc5d04223999e71ee6db6e4f5d80c01c8c915fe92c7ca7463d2cb264774d232d4ab89ebad69f6e5b8dc72e6910139fc68bcf9631a6c88213c80ff3254

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.0.0 RC52 - 2015-03-05
+- Plugin Bootstrap's templates do a better job of outputting content based on site posts.
+
 ### 1.0.0 RC51 - 2015-03-04
 - Fix: Plugin bootstrap only fires if Site has posts.
 - Fix: Use double quotes for HTML attributes in liquid tags.

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

@@ -132,7 +132,7 @@ module Octopress
       def inject_pages(lang=nil)
 
         # Save some time if there are no posts
-        if !Octopress.site.posts.empty?
+        if posts?(lang)
 
           config = self.config(lang)
 
@@ -141,14 +141,30 @@ module Octopress
 
           add_feeds(config, lang, main_feed)
 
-          if defined? Octopress::Linkblog
-            add_feeds(config, lang, links_feed) if Octopress::Linkblog
+          if linkposts?(lang)
+            add_feeds(config, lang, links_feed)
             add_feeds(config, lang, articles_feed)
           end
+
+          add_meta_indexes(config, lang, 'category', 'categories')
+          add_meta_indexes(config, lang, 'tag', 'tags')
+        end
+      end
+
+      def posts?(lang)
+        if lang && Octopress.multilingual?
+          !Octopress.site.posts_by_language(lang).empty?
+        else
+          !Octopress.site.posts.empty?
         end
+      end
 
-        add_meta_indexes(config, lang, 'category', 'categories')
-        add_meta_indexes(config, lang, 'tag', 'tags')
+      def linkposts?(lang)
+        if defined?(Octopress::Linkblog) && lang && Octopress.multilingual?
+          !Octopress.site.linkposts_by_language(lang).empty?
+        else
+          !Octopress.site.posts.select {|p| p.data['linkpost']}.empty?
+        end
       end
 
       def add_indexes(config, lang, template)
@@ -202,11 +218,13 @@ module Octopress
         return unless page_template || feed_template
 
         collection = if lang
-          Octopress::Multilingual.send("#{types}_by_language")[lang].keys
+          Octopress.site.send("#{types}_by_language", lang).keys
         else
           Octopress.site.send("#{types}").keys
         end
 
+        require 'pry-byebug'; binding.pry if config.nil?
+
         # User configured categories or tags
         configured = Array(config[types]).map(&:downcase)
 

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.51
+  version: 1.0.0.rc.52
 platform: ruby
 authors:
 - Brandon Mathis