jekyll-multiple-languages 1.0.11 → 2.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2JlMGUzYmMwODk1NzkxZDlkNzY1M2Y3OGJmOTRhODI5ZGYwYTYxNg==
-  data.tar.gz: !binary |-
-    ZWNhMzk3MDZlN2Y0ZDk2NjE1ZjM3OWJkMmRlYzQyYWJiZTEzYWI3MA==
+SHA1:
+  metadata.gz: 37014369977d7cae2b4ab030f140d34a36283703
+  data.tar.gz: d00fd1b80de40d57bd154b30631a17e8e2081b4b
 SHA512:
-  metadata.gz: !binary |-
-    NTdhN2M5ODViOTdlZGU1Y2RiYTY5NmRkYzgxMTY0NDQ4ZmVkN2IwMjZhNDZl
-    MmRlMTUxZDY1NjQ4NTg3NTcwYTM1YzQ5YzgxNThlMDA0MjdiYzdkNDI5ZTI2
-    NWJmZTk1MDk5MzczMjIwY2Y1YmM4NTJhYzY2M2JkZjBhMzFmZTA=
-  data.tar.gz: !binary |-
-    ZDZiNDFlYTFjMTI5NGUyYTRkZDIwYzcxMjIxMTc4OGI3ZjRiYTFhNWQ4OTdm
-    MmI3NWZkYmRmY2I1YmZlNjgwYTFiMjBmNGRjMWFlNjBhOWFlOTc1NDRkMTI3
-    YjVhN2U4ZWM1MDk0ZTYzYTg5ZjU3YmNjNmMzYjAwZjhmZjNlZjU=
+  metadata.gz: 45743cc76873f8e3da56d5ecf46a9c5df647ef38d957a11f3865797ad3a7109373f7e10a7b315736efa74f801dfa89995f8960b402726c58726e8d32567a52f4
+  data.tar.gz: 296856ed323cecf234dc77598c1fb96c93578c0a2df5e078ad878485fe8b7b0b79af7a171a04f0c23742f3b7d96bb6583be97b96c63bf92a86a91de7d73f7685

data/lib/jekyll-multiple-languages.rb

@@ -1,278 +1,8 @@
-require "jekyll-multiple-languages/pager"
+require "jekyll-multiple-languages/multilang"
+require "jekyll-multiple-languages/site"
+require "jekyll-multiple-languages/document"
+require "jekyll-multiple-languages/page"
+
 require "jekyll-multiple-languages/pagination"
+require "jekyll-multiple-languages/pager"
 require "jekyll-multiple-languages/tags"
-module Jekyll
-  module MultiLang
-    attr_accessor :language, :name_no_language, :is_default_language, :url_no_language, :dir_source, :next_in_language, :previous_in_language
-
-    # rewirte initialize
-    def process_initialize(site, base, dir, name)
-      name_no_language = name.dup
-
-      lang = ''
-      # xxx.$lang.md / $lang.xxx.md
-      site.config['languages'].each{ |item|
-        lang_str = item + '.'
-        if name_no_language.include? lang_str
-          lang = item
-          name_no_language.slice! lang_str
-        end
-      }
-
-      !lang || lang == '' && lang = site.config['language_default']
-      @language = lang
-      @dir_source = dir
-      @name_no_language = name_no_language
-      @is_default_language = lang == site.config['language_default']
-
-      initialize_org(site, base, dir, name)
-    end
-
-    def url_no_language
-      if !@url_no_language
-        process_url
-      end
-      @url_no_language
-    end
-
-    def next_in_language
-      posts = site.posts_by_language[@language].values
-      pos = posts.index { |post| post.equal?(self) }
-      if pos && pos < posts.length - 1
-        posts[pos + 1]
-      else
-        nil
-      end
-    end
-
-    def previous_in_language
-      posts = site.posts_by_language[@language].values
-      pos = posts.index { |post| post.equal?(self) }
-      if pos && pos > 0
-        posts[pos - 1]
-      else
-        nil
-      end
-    end
-
-    # rewirte url
-    def process_url
-      if !@url
-        url = self.url_org 
-        @url_no_language = url
-        lang_prefix = '/' + self.language
-        if !self.is_default_language && (url && url.index(lang_prefix) != 0)
-          url = lang_prefix + url
-        end
-        @url = url
-      end
-      @url
-    end
-
-    # rewirte to_liquid
-    def process_to_liquid(attrs = nil)
-      data_for_liquid = self.to_liquid_org(attrs)
-      attrs_for_lang = self.language_attributes_for_liquid || []
-      attrs_for_lang.concat(%w[language is_default_language url_no_language previous_in_language next_in_language])
-      further_data = Hash[attrs_for_lang.map { |attribute|
-        [attribute, send(attribute)]
-      }]
-      data_for_liquid = Utils.deep_merge_hashes(data_for_liquid, further_data)
-    end
-  end
-
-  # Rewrite Jekyll.site
-  #
-  class Site
-    attr_accessor :language_default, :languages, :posts_by_language, :pages_by_language, :fill_default_content
-    alias :process_org :process
-    def process
-      self.begin_inject
-      process_org
-    rescue Exception => e
-      print e.message, "\n"
-      print e.backtrace.join("\n")
-    end
-
-    alias :read_org :read
-    def read
-      read_org
-      group_posts_and_pages
-    end
-
-    # Group the post by the language
-    #
-    def group_posts_and_pages
-      lang_default = self.language_default
-      langs_remain = self.languages.dup
-      langs_remain.delete(lang_default)
-
-      @posts_by_language = {}
-      @pages_by_language = {}
-
-      self.languages.dup.each { |lang|
-        @posts_by_language[lang] ||= {}
-        @pages_by_language[lang] ||= {}
-      }
-
-      self.posts.each {|post|
-        @posts_by_language[post.language][post.url_no_language] = post
-      }
-      self.pages.each {|page|
-        @pages_by_language[page.language][page.url_no_language] = page
-      }
-
-      if (@fill_default_content)
-        self.fill_default_content(@posts, @posts_by_language, lang_default, langs_remain, Post)
-        self.fill_default_content(@pages, @pages_by_language, lang_default, langs_remain, Page)
-      end
-    end
-
-    def fill_default_content(contents, grouped_contents, default, targets, kclass)
-      grouped_contents[default].select{|k,v| !v.data['no_fill_default_content']}.each{ |k, content|
-        targets.each{|lang|
-          if !grouped_contents[lang][k]
-            c = kclass.new(self, @source, content.dir_source, content.name)
-            c.language = lang
-            c.is_default_language = false
-            grouped_contents[lang][k] = c
-            contents << c
-          end
-        }
-      }
-    end
-
-    # Only when site is initialized, this plugin will be loaded
-    def begin_inject
-      self.update_config(self.config)
-    end
-
-    # Public: Update site config, process languages and language_default options.
-    #
-    def update_config(config)
-      !config['languages'] && config['languages'] = []
-      !config['language_default'] && config['language_default'] = config['languages'].first;
-      !config['i18ndir'] && config['i18ndir'] = "_i18n";
-
-      %w[languages language_default fill_default_content].each do |opt|
-        self.send("#{opt}=", config[opt])
-      end
-    end
-
-    alias :site_payload_org :site_payload
-    def site_payload
-      original = site_payload_org
-      payload = original['site']
-      payload = payload.merge({
-        'posts_by_language' => self.posts_by_language,
-        'pages_by_language' => self.pages_by_language
-      })
-      original['site'] = payload
-      original
-    end
-
-  end
-
-  class Page
-
-    include MultiLang
-
-    LANGUAGE_ATTRIBUTES_FOR_LIQUID = %w[]
-
-    alias :initialize_org :initialize
-    def initialize(site, base, dir, name)
-      process_initialize(site, base, dir, name)
-    end
-
-    alias :url_org :url
-    def url
-      if @language
-        process_url
-      else
-        url_org
-      end
-    end
-
-    alias :process_org :process
-    def process(name)
-      if @language
-        process_org(@name_no_language)
-      else
-        process_org(name)
-      end
-    end
-
-    alias :to_liquid_org :to_liquid
-    def to_liquid(attrs = nil)
-      if @language
-        process_to_liquid(attrs)
-      else
-        to_liquid_org(attrs)
-      end
-    end
-
-    def language_attributes_for_liquid
-      LANGUAGE_ATTRIBUTES_FOR_LIQUID
-    end
-
-    def inspect
-      "#<Jekyll:Page @name=#{self.name.inspect} @url=#{self.url.inspect}>"
-    end
-
-  end
-
-  class Post
-    include MultiLang
-
-    MATCHER_WITH_LANG = /^(.+\/)*(?:.+\.)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
-
-    alias :initialize_org :initialize
-    def initialize(site, source, dir, name)
-      process_initialize(site, source, dir, name)
-    end
-
-    alias :url_org :url
-    def url
-      if @language
-        process_url
-      else
-        url_org
-      end
-    end
-
-    alias :process_org :process
-    def process(name)
-      if @language
-        process_org(@name_no_language)
-      else
-        process_org(name)
-      end
-    end
-
-    def inspect
-      "<Post: id: #{self.id} url: #{self.url} language: #{self.language}>"
-    end
-
-    # For match /blog/$lang.2014-02-14-the-blog-name.md 
-    # or /blog/2014-02-14-the-blog-name.$lang.md
-    #
-    def self.valid?(name)
-      name =~ MATCHER_WITH_LANG
-    end
-
-    def language_attributes_for_liquid
-
-    end
-
-    alias :to_liquid_org :to_liquid
-    def to_liquid(attrs = nil)
-      if @language
-        process_to_liquid(attrs)
-      else
-        to_liquid_org(attrs)
-      end
-    end
-
-  end
-
-end

data/lib/jekyll-multiple-languages/document.rb

@@ -0,0 +1,51 @@
+# encoding: UTF-8
+module Jekyll
+  class Document
+    include MultiLang
+
+    alias :initialize_org :initialize
+    def initialize(path, relations)
+      detect_language(relations[:site], path)
+      initialize_org(path, relations)
+    end
+
+    # remove `.$lang` from slug
+    alias :post_read_org :post_read
+    def post_read
+      post_read_org
+      if not @is_default_language and data and data['slug']
+        data['slug'] ['.' + @language] = ''
+      end
+    end
+
+    # remove `.$lang` from basename_without_ext
+    def basename_without_ext
+      if not @basename_without_ext
+        @basename_without_ext = File.basename(path, '.*')
+        if not @is_default_language
+          @basename_without_ext ['.' + @language] = ''
+        end
+      end
+      @basename_without_ext
+    end
+
+    # append `/$lang/ before path for non-default language document
+    alias :url_org :url
+    def url
+      rewrite_url(url_org)
+    end
+
+    def inspect
+      "<Post: id: #{self.id} url: #{self.url} language: #{self.language}>"
+    end
+
+    def language_attributes_for_liquid
+    end
+
+    alias :to_liquid_org :to_liquid
+    def to_liquid()
+      data = to_liquid_org
+      append_data_for_liquid(data)
+    end
+  end
+end

data/lib/jekyll-multiple-languages/multilang.rb

@@ -0,0 +1,70 @@
+# encoding: UTF-8
+module Jekyll
+  module MultiLang
+    attr_accessor :language, :is_default_language, :url_no_language, :next_in_language, :previous_in_language
+
+    def detect_language(site, name)
+      name_no_language = name.dup
+
+      # detect language
+      # xxx.$lang.md / $lang.xxx.md
+      lang = nil
+      site.config['languages'].each{ |item|
+        lang_str = item + '.'
+        if name_no_language.include? lang_str
+          lang = item
+          name_no_language.slice! lang_str
+        end
+      }
+
+      lang ||= site.config['language_default']
+
+      @language = lang
+      @name_no_language = name_no_language
+      @is_default_language = lang == site.config['language_default']
+    end
+
+    def url_no_language
+      @url_no_language
+    end
+
+    def next_in_language
+      posts = site.posts_by_language[@language].values
+      pos = posts.index { |post| post.equal?(self) }
+      if pos && pos < posts.length - 1
+        posts[pos + 1]
+      else
+        nil
+      end
+    end
+
+    def previous_in_language
+      posts = site.posts_by_language[@language].values
+      pos = posts.index { |post| post.equal?(self) }
+      if pos && pos > 0
+        posts[pos - 1]
+      else
+        nil
+      end
+    end
+
+    # rewrite url
+    def rewrite_url(url)
+      @url_no_language = url
+      if not @is_default_language
+        url = '/' + language + url
+      end
+      url
+    end
+
+    def append_data_for_liquid(data_for_liquid)
+      attrs_for_lang = self.language_attributes_for_liquid || []
+      attrs_for_lang.concat(%w[language is_default_language url_no_language previous_in_language next_in_language])
+      further_data = Hash[attrs_for_lang.map { |attribute|
+        [attribute, send(attribute)]
+      }]
+      data_for_liquid = Utils.deep_merge_hashes(data_for_liquid, further_data)
+    end
+
+  end
+end

data/lib/jekyll-multiple-languages/page.rb

@@ -0,0 +1,40 @@
+# encoding: UTF-8
+module Jekyll
+  class Page
+    include MultiLang
+
+    attr_accessor :dir_org
+
+    alias :initialize_org :initialize
+    def initialize(site, base, dir, name)
+      detect_language(site, name)
+      @dir_org = dir
+      initialize_org(site, base, dir, name)
+    end
+
+    # remove `.$lang` for basename
+    alias :process_org :process
+    def process(name)
+      @ext = File.extname(name)
+      @basename = name[0 .. -ext.length - 1]
+      if not @is_default_language
+        @basename ['.' + @language] = ''
+      end
+    end
+
+    # append `/$lang/ before path for non-default language document
+    alias :url_org :url
+    def url
+      rewrite_url(url_org)
+    end
+
+    def language_attributes_for_liquid 
+    end
+
+    alias :to_liquid_org :to_liquid
+    def to_liquid()
+      data = to_liquid_org
+      append_data_for_liquid(data)
+    end
+  end
+end

data/lib/jekyll-multiple-languages/pagination.rb

@@ -6,6 +6,7 @@ module Jekyll
     # => /$lang/... /...
     # 
     class Pagination < Generator
+
       def generate(site)
         if Pager.pagination_enabled?(site)
           pages = find_template_pages(site)
@@ -26,7 +27,7 @@ module Jekyll
         (1..pages).each do |num_page|
           pager = Pager.new(site, the_template_page, num_page, all_posts, pages)
           if num_page > 1
-            newpage = Page.new(site, site.source, the_template_page.dir_source, the_template_page.name)
+            newpage = Page.new(site, site.source, the_template_page.dir_org, the_template_page.name)
             newpage.pager = pager
             newpage.dir = Pager.calc_paginate_path(site, the_template_page, num_page)
             site.pages << newpage

data/lib/jekyll-multiple-languages/site.rb

@@ -0,0 +1,99 @@
+# encoding: UTF-8
+module Jekyll
+  # Rewrite Jekyll.site
+  #
+  class Site
+    attr_accessor :language_default, :languages, :posts_by_language, :pages_by_language, :fill_default_content
+
+    alias :process_org :process
+    def process
+      self.begin_inject
+      process_org
+    rescue Exception => e
+      print e.message, "\n"
+      print e.backtrace.join("\n")
+    end
+
+    alias :read_org :read
+    def read
+      read_org
+      group_posts_and_pages
+    end
+
+    # Group the post by the language
+    #
+    def group_posts_and_pages
+      lang_default = self.language_default
+      langs_remain = self.languages.dup
+      langs_remain.delete(lang_default)
+
+      @posts_by_language = {}
+      @pages_by_language = {}
+
+      self.languages.dup.each { |lang|
+        @posts_by_language[lang] ||= {}
+        @pages_by_language[lang] ||= {}
+      }
+
+      self.posts.docs.each {|post|
+        @posts_by_language[post.language][post.url_no_language] = post
+      }
+      self.pages.each {|page|
+        # @pages_by_language[page.language][page.url_no_language] = page
+      }
+
+      if (@fill_default_content)
+        self.fill_default_content(@posts, @posts_by_language, lang_default, langs_remain, Post)
+        self.fill_default_content(@pages, @pages_by_language, lang_default, langs_remain, Page)
+      end
+    end
+
+    def fill_default_content(contents, grouped_contents, default, targets, kclass)
+      grouped_contents[default].select{|k,v| !v.data['no_fill_default_content']}.each{ |k, content|
+        targets.each{|lang|
+          if !grouped_contents[lang][k]
+            c = kclass.new(self, @source, content.dir_source, content.name)
+            c.language = lang
+            c.is_default_language = false
+            grouped_contents[lang][k] = c
+            contents << c
+          end
+        }
+      }
+    end
+
+    # Only when site is initialized, this plugin will be loaded
+    def begin_inject
+      self.update_config(self.config)
+    end
+
+    # Update config, process languages and language_default options.
+    #
+    def update_config(config)
+
+      config['languages'] ||= []
+      config['language_default'] ||= config['languages'].first;
+
+      # set the default value of `i18ndir` to `_i18n`
+      config['i18ndir'] ||= "_i18n";
+
+      %w[languages language_default fill_default_content].each do |opt|
+        self.send("#{opt}=", config[opt])
+      end
+    end
+
+    # add `posts_by_language` and `pages_by_language`
+    alias :site_payload_org :site_payload
+    def site_payload
+      original = site_payload_org
+      payload = original['site']
+      payload = payload.merge({
+        'posts_by_language' => self.posts_by_language,
+        'pages_by_language' => self.pages_by_language
+      })
+      original['site'] = payload
+      original
+    end
+
+  end
+end

data/lib/jekyll-multiple-languages/tags.rb

@@ -1,7 +1,8 @@
+# encoding: UTF-8
 module Jekyll
   @translations={}
   def self.translations
-        @translations
+    @translations
   end
 
   class LocalizeTag < Liquid::Tag

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 2.0.1
 platform: ruby
 authors:
 - srain
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: srain@php.net
@@ -18,8 +18,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-multiple-languages.rb
+- lib/jekyll-multiple-languages/document.rb
+- lib/jekyll-multiple-languages/multilang.rb
+- lib/jekyll-multiple-languages/page.rb
 - lib/jekyll-multiple-languages/pager.rb
 - lib/jekyll-multiple-languages/pagination.rb
+- lib/jekyll-multiple-languages/site.rb
 - lib/jekyll-multiple-languages/tags.rb
 homepage: http://jekyll-langs.liaohuqiu.net/
 licenses:
@@ -31,17 +35,17 @@ 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.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Another Multiple Languages Plugin for Jekyll!