octopress-multilingual 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63e94caebb32bb02400c36549a41dcdac7b6233
-  data.tar.gz: d8d6a66d61b17e308e368beaeda4755192efdcb8
+  metadata.gz: 55767d804774338b29cb6aa179a2860f02340830
+  data.tar.gz: 9c08d484dc5849979db2f02ca88ec38077915a68
 SHA512:
-  metadata.gz: 763b84afc697d3223900e426c8141bf6e5075e833b24860a47f079489b0d3136ee6ce3346973948027dddd1b91417b020840762e873db1f3432a239f84ad3681
-  data.tar.gz: 5a4a430a9d3058bc3728c6c6a99635ccbee09e413f5b6248ef5d0a1437fd63c7b1a7da7e550172f6b572674fa7929eb02ea2d84820b8463b4b971d479e479edd
+  metadata.gz: 936197c883e054290766af156b34a1ae5c7cbcaf53c577d4ef14af2b68562d700d866b5924900d24191ab4caad8ab8960cfdc636adf3c10ca6e1e2facb2f75e5
+  data.tar.gz: b58cc57ee3c12ce7c73991bcd38c313bc4fddd1f43228f3f7ad7eba7eff1d5064f092a61e4b994da3bbbcb0de76eeff526a913dadd371e5f4c8533ca9256604d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.2.0 (2015-03-05)
+- New: Site methods, `tags_by_language` and `categories_by_language`.
+- New: Methods `posts_by_language`, `articles_by_language`, `linkposts_by_language`, `categories_by_language`, `tags_by_language` now accept a language and return an empty array or empty hash rather than `nil` if no posts exist.
+
 ### 1.1.3 (2015-03-02)
 - Fix: Posts permalinks will only have language defined if the site has a default language.
 

data/lib/octopress-multilingual.rb

@@ -71,7 +71,7 @@ module Octopress
       end
     end
 
-    def posts_by_language
+    def posts_by_language(lang=nil)
       @posts_by_language ||= begin
         posts = site.posts.reverse.select(&:lang).group_by(&:lang)
         ## Add posts that crosspost to all languages
@@ -83,9 +83,10 @@ module Octopress
         end
 
         posts[main_language] = main_language_posts
-
         posts
       end
+
+      @posts_by_language[lang] || []
     end
 
     def crossposts
@@ -102,12 +103,12 @@ module Octopress
       @posts_without_lang ||= site.reject(&:lang)
     end
 
-    def articles_by_language
+    def articles_by_language(lang=nil)
       @articles_by_language ||= begin
         articles = {}
 
         languages.each do |lang|
-          if posts = posts_by_language[lang]
+          if posts = posts_by_language(lang)
             articles[lang] = posts.reject do |p|
               p.data['linkpost']
             end
@@ -116,14 +117,16 @@ module Octopress
 
         articles
       end
+
+      @articles_by_language[lang] || []
     end
 
-    def linkposts_by_language
+    def linkposts_by_language(lang=nil)
       @linkposts_by_language ||= begin
         linkposts = {}
 
         languages.each do |lang|
-          if posts = posts_by_language[lang]
+          if posts = posts_by_language(lang)
             linkposts[lang] = posts.select do |p|
               p.data['linkpost']
             end
@@ -132,6 +135,8 @@ module Octopress
 
         linkposts
       end
+
+      @linkposts_by_language[lang] || []
     end
 
     def metadata_index_by_language(index)
@@ -155,22 +160,24 @@ module Octopress
       indexes
     end
 
-    def categories_by_language
+    def categories_by_language(lang=nil)
       @categories ||= metadata_index_by_language(:categories)
+      @categories[lang] || {}
     end
 
-    def tags_by_language
+    def tags_by_language(lang=nil)
       @tags ||= metadata_index_by_language(:tags)
+      @tags[lang] || {}
     end
 
     def page_payload(lang)
       payload = {
         'site' => { 
-          'posts'      => posts_by_language[lang],
-          'linkposts'  => linkposts_by_language[lang],
-          'articles'   => articles_by_language[lang],
-          'categories' => categories_by_language[lang],
-          'tags'       => tags_by_language[lang]
+          'posts'      => posts_by_language(lang),
+          'linkposts'  => linkposts_by_language(lang),
+          'articles'   => articles_by_language(lang),
+          'categories' => categories_by_language(lang),
+          'tags'       => tags_by_language(lang)
         },
         'lang' => lang_dict[lang]
       }

data/lib/octopress-multilingual/jekyll.rb

@@ -17,16 +17,24 @@ module Jekyll
       Octopress::Multilingual.languages
     end
 
-    def posts_by_language
-      Octopress::Multilingual.posts_by_language
+    def posts_by_language(lang=nil)
+      Octopress::Multilingual.posts_by_language(lang)
     end
 
-    def articles_by_language
-      Octopress::Multilingual.articles_by_language
+    def articles_by_language(lang=nil)
+      Octopress::Multilingual.articles_by_language(lang)
     end
 
-    def linkposts_by_language
-      Octopress::Multilingual.linkposts_by_language
+    def linkposts_by_language(lang=nil)
+      Octopress::Multilingual.linkposts_by_language(lang)
+    end
+
+    def categories_by_language(lang=nil)
+      Octopress::Multilingual.categories_by_language(lang)
+    end
+
+    def tags_by_language(lang=nil)
+      Octopress::Multilingual.tags_by_language(lang)
     end
   end
 
@@ -117,7 +125,7 @@ module Jekyll
 
     def next
       language = lang || site.config['lang']
-      posts = Octopress::Multilingual.posts_by_language[language]
+      posts = Octopress::Multilingual.posts_by_language(language)
 
       pos = posts.index {|post| post.equal?(self) }
       if pos && pos < posts.length - 1
@@ -129,7 +137,7 @@ module Jekyll
 
     def previous
       language = lang || site.config['lang']
-      posts = Octopress::Multilingual.posts_by_language[language]
+      posts = Octopress::Multilingual.posts_by_language(language)
 
       pos = posts.index {|post| post.equal?(self) }
       if pos && pos > 0

data/lib/octopress-multilingual/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Multilingual
-    VERSION = "1.1.3"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-multilingual
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks