octopress-multilingual 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e53c8c656e02f71a493c1e79cd8765dfbeafc2ae
-  data.tar.gz: 1aa1a62b8dce6b50647d1a1a646adf64986a8353
+  metadata.gz: 302fae77a236cb4710f11f33a190439faeadffea
+  data.tar.gz: be11a982c1bbf2978e2fb96a951400b19e118819
 SHA512:
-  metadata.gz: cadc57ee19e7ed3f90e57ecd3497720e5fcf0309c0b136bc119852af329d1fccebe2437c4fcd64b216a48464bafe6924d0730cd9b6b3dcff4997ccedbcb79d5b
-  data.tar.gz: fa6d4745b493a0060fa8eb5708ae4d75457843bdfc6a9a617df546982764217c90f5aacb46d4db5e28a3de81ce4115ea6c57460067d433405827da70a9106c20
+  metadata.gz: 17da4fccb7e37da3d0e0176d9c7f9a8d67768330253f116ca6e24ee2e11c40d5c994005cac6aa0dc6c9651b057556e2ea7d983c78885c3cd696f35b1b796b8cf
+  data.tar.gz: b105ea8c82961ee6030b7bff45334e0350ab79c5a474ae0b4963c8b4a327e0872c2023f814d0be9e8c7b629beb90f76ee62030d74a1b5314a45af741588c5793

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.1.2 (2015-01-31)
+- Now pages can use the /:lang/ permalink placeholder.
+- New site methods: `posts_by_language`, `articles_by_language`, `linkposts_by_language`, `languages`.
+
 ### 0.1.1 (2015-01-30)
 - Fix: On pages, `lang: default` now defaults to `site.lang`.
 

data/lib/octopress-multilingual.rb

@@ -103,19 +103,12 @@ module Octopress
       else
         return unless main_language
 
-        @payload ||= begin
-          payload = {
-            'posts_by_language' => posts_by_language,
-            'languages'         => languages
-          }
-
-          if defined? Octopress::Linkblog
-            payload['linkposts_by_language'] = linkposts_by_language
-            payload['articles_by_language']  = articles_by_language
-          end
-
-          payload
-        end
+        @payload ||= {
+          'posts_by_language'     => posts_by_language,
+          'linkposts_by_language' => linkposts_by_language,
+          'articles_by_language'  => articles_by_language,
+          'languages'             => languages
+        }
       end
     end
   end

data/lib/octopress-multilingual/hooks.rb

@@ -1,19 +1,13 @@
 module Octopress
   module Multilingual
-    class SiteHookRead < Hooks::Site
+    class SiteHook < Hooks::Site
       priority :high
       # Generate site_payload so other plugins can access
       def post_read(site)
         Octopress::Multilingual.site = site
+        site.config['languages'] = site.languages
       end
-    end
-
-    class SiteHook < Hooks::Site
-      # Use a low priority so that other hooks can act on posts
-      # without having to be designed for mutlilingual sites.
-      priority :high
 
-      #
       def merge_payload(payload, site)
         { 'site' => Octopress::Multilingual.site_payload }
       end

data/lib/octopress-multilingual/jekyll.rb

@@ -12,6 +12,24 @@ module Jekyll
     end
   end
 
+  class Site
+    def languages
+      Octopress::Multilingual.languages
+    end
+
+    def posts_by_language
+      Octopress::Multilingual.posts_by_language
+    end
+
+    def articles_by_language
+      Octopress::Multilingual.articles_by_language
+    end
+
+    def linkposts_by_language
+      Octopress::Multilingual.linkposts_by_language
+    end
+  end
+
   class Document
     def lang
       if data['lang']
@@ -21,11 +39,20 @@ module Jekyll
   end
 
   class Page
+    alias :permalink_orig :permalink
+
     def lang
       if data['lang']
         data['lang'].downcase
       end
     end
+
+    def permalink
+      if permalink = permalink_orig
+        data['permalink'].sub!(/:lang/, lang)
+        permalink.sub(/:lang/, lang)
+      end
+    end
   end
 
   class Post
@@ -57,7 +84,6 @@ module Jekyll
     end
 
     def url_placeholders
-
       url_placeholders_orig.merge({
         :lang => lang
       })

data/lib/octopress-multilingual/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Multilingual
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

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