jekyll-multiple-languages 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDkxYjFmMTljMGEzMDNkMGQ5MDRhODRkNzhmMGViYTg2NDgwMDFhYQ==
+    M2UwMjlhMDZhNDA4MGJlZTJiNTljOTU3NTk5YjEzNDkzZmYyYmYzZg==
   data.tar.gz: !binary |-
-    ZTc2YmM5MGVhMjM5OGY4OTU4YzkzNWZlYWJmNTcyZTYxNGFjMzQyOA==
+    MmViOWVhYjQyOTRlZWYxNWQ0Njc4MmExZmY2MWUxZDdjZmZmNjkxMA==
 SHA512:
   metadata.gz: !binary |-
-    Y2ZhM2JkYjJhYjdhNDU3ODQxODNiZDcwYTZhODI5ODA0NTAyNDcxNDFlMzg5
-    MzNhNjg1MWQ1YTM1YTFmOTEyNDE1OTY3OTljMjU5YmE0Yjc0ZGNhOTNhOWE2
-    ZTkwMDQ5MjliNDc3MmEzOTEzN2E0NzAzMjY0NzRlNzEwOGNmMTc=
+    ZTQ1NWJhMjAwMzkyOTk1Y2IyYTlkY2UzMmQ4NmRlYzU0YjlkMWI4MTU1MTZh
+    MzgwMTQ4NzE5ZTA5MWY4NDQ1Y2FmOWI5MDc4M2JjYjNjM2EwN2Y1ZmJlYjM3
+    MzUzNjg2MWU3ZDc4NmJlZTY5Mzg5MGM2ZTIxZDJhNGIzYjkwYmY=
   data.tar.gz: !binary |-
-    Y2YyNGU1N2JjOGU0ZGMwMWQ3MTc4MGEzOWQ0ZmM1ZmRhOWJmYWYxMDhmOWU5
-    MWY5NzE3Zjg0NDY2OWRmZjBkZGEzMzE5OWNmZGZmZjc0NjZlYTg1Y2QwOTRk
-    NzQ5MjcxYTQ5MGIxNzNlYWJmZjYwZjNmZGM1NGM5MDFhZDY5NTI=
+    NzNjNDg0NWEwZDgwOTRjM2Q3MDQzM2NjZGQzNTYyYTA4ZGI5NTQzNTVkODkz
+    OGYwYjNmOGUwNDFlMDMyMmNiMzJiZjExZWZiMDYyMGNiNzZlOGIxZGZmOTc5
+    OTIyNzU3ZTZlMWE5YTQyMTNkODAyN2E4NTA3NGRhOWQ2ODBkYmE=

data/lib/jekyll-multiple-languages.rb

@@ -1,3 +1,5 @@
+require "jekyll-multiple-languages/pager"
+require "jekyll-multiple-languages/pagination"
 module Jekyll
   module MultiLang
     attr_accessor :language, :name_no_language, :is_default_language, :url_no_language, :dir_source
@@ -221,109 +223,4 @@ module Jekyll
 
   end
 
-  module Generators
-
-    # index.$lang.html / index.html
-    #
-    # => /$lang/... /...
-    # 
-    class Pagination < Generator
-      def generate(site)
-        if Pager.pagination_enabled?(site)
-          pages = find_template_pages(site)
-          if pages && !pages.empty?
-            pages.each {|page| paginate_for_language(site, page)}
-          else
-            Jekyll.logger.warn "Pagination:", "Pagination is enabled, but I couldn't find " +
-              "an index.html page to use as the pagination template. Skipping pagination."
-          end
-        end
-      end
-
-      def paginate_for_language(site, the_template_page)
-        lang = the_template_page.language
-        all_posts = site.posts_by_language[lang] || {}
-        all_posts = all_posts.values.sort { |a, b| b <=> a }
-        pages = Pager.calculate_pages(all_posts, site.config['paginate'].to_i)
-        (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.pager = pager
-            newpage.dir = Pager.calc_paginate_path(site, the_template_page, num_page)
-            site.pages << newpage
-          else
-            the_template_page.pager = pager
-          end
-        end
-      end
-
-      # Find all the cadidate pages
-      #
-      def find_template_pages(site)
-        site.pages.dup.select do |page|
-          Pager.pagination_candidate?(site.config, page)
-        end.sort do |one, two|
-          two.path.size <=> one.path.size
-        end
-      end
-    end
-  end
-
-  class Pager
-
-    # Static: Return the pagination path of the page
-    #
-    # site     - the Jekyll::Site object
-    # the_template_page - template page
-    # num_page - the pagination page number
-    #
-    # Returns the pagination path as a string
-    def self.calc_paginate_path(site, the_template_page, num_page)
-      return nil if num_page.nil?
-      return the_template_page.url if num_page <= 1
-      format = site.config['paginate_path']
-      format = format.sub(':num', num_page.to_s)
-      path = ensure_leading_slash(format)
-      path
-    end
-
-    def self.calc_paginate_path_with_lang(site, the_template_page, num_page)
-      path = self.calc_paginate_path(site, the_template_page, num_page)
-      return nil if path.nil?
-      lang_prefix = '/' + the_template_page.language
-      if !the_template_page.is_default_language && (path && path.index(lang_prefix) != 0)
-        path = '/' + the_template_page.language + path
-      end
-      path
-    end
-
-    def self.pagination_candidate?(config, page)
-      page_dir = File.dirname(File.expand_path(remove_leading_slash(page.path), config['source']))
-      paginate_path = remove_leading_slash(config['paginate_path'])
-      paginate_path = File.expand_path(paginate_path, config['source'])
-      page.basename == 'index' &&
-        in_hierarchy(config['source'], page_dir, File.dirname(paginate_path))
-    end
-
-    def initialize(site, the_template_page, page, all_posts, num_pages = nil)
-      @page = page
-      @per_page = site.config['paginate'].to_i
-      @total_pages = num_pages || Pager.calculate_pages(all_posts, @per_page)
-
-      if @page > @total_pages
-        raise RuntimeError, "page number can't be greater than total pages: #{@page} > #{@total_pages}"
-      end
-
-      init = (@page - 1) * @per_page
-      offset = (init + @per_page - 1) >= all_posts.size ? all_posts.size : (init + @per_page - 1)
-
-      @total_posts = all_posts.size
-      @posts = all_posts[init..offset]
-      @previous_page = @page != 1 ? @page - 1 : nil
-      @previous_page_path = Pager.calc_paginate_path_with_lang(site, the_template_page, @previous_page)
-      @next_page = @page != @total_pages ? @page + 1 : nil
-      @next_page_path = Pager.calc_paginate_path_with_lang(site, the_template_page, @next_page)
-    end
-  end
 end

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

@@ -0,0 +1,61 @@
+module Jekyll
+  module Paginate
+    class Pager
+
+      # Static: Return the pagination path of the page
+      #
+      # site     - the Jekyll::Site object
+      # the_template_page - template page
+      # num_page - the pagination page number
+      #
+      # Returns the pagination path as a string
+      def self.calc_paginate_path(site, the_template_page, num_page)
+        return nil if num_page.nil?
+        return the_template_page.url if num_page <= 1
+        format = site.config['paginate_path']
+        format = format.sub(':num', num_page.to_s)
+        path = ensure_leading_slash(format)
+        path
+      end
+
+      def self.calc_paginate_path_with_lang(site, the_template_page, num_page)
+        path = self.calc_paginate_path(site, the_template_page, num_page)
+        return nil if path.nil?
+        lang_prefix = '/' + the_template_page.language
+        if !the_template_page.is_default_language && (path && path.index(lang_prefix) != 0)
+          path = '/' + the_template_page.language + path
+        end
+        path
+      end
+
+      def self.pagination_candidate?(config, page)
+        page_dir = File.dirname(File.expand_path(remove_leading_slash(page.path), config['source']))
+        paginate_path = remove_leading_slash(config['paginate_path'])
+        paginate_path = File.expand_path(paginate_path, config['source'])
+        page.basename == 'index' &&
+          in_hierarchy(config['source'], page_dir, File.dirname(paginate_path))
+      end
+
+      def initialize(site, the_template_page, page, all_posts, num_pages = nil)
+        @page = page
+        @per_page = site.config['paginate'].to_i
+        @total_pages = num_pages || Pager.calculate_pages(all_posts, @per_page)
+
+        if @page > @total_pages
+          raise RuntimeError, "page number can't be greater than total pages: #{@page} > #{@total_pages}"
+        end
+
+        init = (@page - 1) * @per_page
+        offset = (init + @per_page - 1) >= all_posts.size ? all_posts.size : (init + @per_page - 1)
+
+        @total_posts = all_posts.size
+        @posts = all_posts[init..offset]
+        @previous_page = @page != 1 ? @page - 1 : nil
+        @previous_page_path = Pager.calc_paginate_path_with_lang(site, the_template_page, @previous_page)
+        @next_page = @page != @total_pages ? @page + 1 : nil
+        @next_page_path = Pager.calc_paginate_path_with_lang(site, the_template_page, @next_page)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module Jekyll
+  module Paginate
+
+    # index.$lang.html / index.html
+    #
+    # => /$lang/... /...
+    # 
+    class Pagination < Generator
+      def generate(site)
+        if Pager.pagination_enabled?(site)
+          pages = find_template_pages(site)
+          if pages && !pages.empty?
+            pages.each {|page| paginate_for_language(site, page)}
+          else
+            Jekyll.logger.warn "Pagination:", "Pagination is enabled, but I couldn't find " +
+              "an index.html page to use as the pagination template. Skipping pagination."
+          end
+        end
+      end
+
+      def paginate_for_language(site, the_template_page)
+        lang = the_template_page.language
+        all_posts = site.posts_by_language[lang] || {}
+        all_posts = all_posts.values.sort { |a, b| b <=> a }
+        pages = Pager.calculate_pages(all_posts, site.config['paginate'].to_i)
+        (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.pager = pager
+            newpage.dir = Pager.calc_paginate_path(site, the_template_page, num_page)
+            site.pages << newpage
+          else
+            the_template_page.pager = pager
+          end
+        end
+      end
+
+      # Find all the cadidate pages
+      #
+      def find_template_pages(site)
+        site.pages.dup.select do |page|
+          Pager.pagination_candidate?(site.config, page)
+        end.sort do |one, two|
+          two.path.size <=> one.path.size
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Srain
@@ -17,6 +17,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-multiple-languages.rb
+- lib/jekyll-multiple-languages/pager.rb
+- lib/jekyll-multiple-languages/pagination.rb
 homepage: http://jekyll-langs.liaohuqiu.net/
 licenses:
 - MIT