jekyll-polyglot 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c8a3bf16dd0455f8c5bd7f59d6af52497841ca
-  data.tar.gz: 0cf51394151e5a6a1652891530a645bffbd43a77
+  metadata.gz: b617e95642f5c0337a8b7dd35416aad11a5dee21
+  data.tar.gz: 83af2f5194ba33e22e9a8f77f7996af6f79fd07d
 SHA512:
-  metadata.gz: 6cb846b3bac1a1cdaac5f82693e39d5c4a76ff620ef2c88129bdf7762a076951914e67ba63b658654085e33c511b385579bc981bdc2e23078bfd33299a058185
-  data.tar.gz: f81bbd4f9bfd0400a2c2f9b488538b8faca334d68aac9b8536a10700558d69b7236a849dc906f7a1bc708d54153642fc4ce2d56ce49d7992f543792d7692e6ab
+  metadata.gz: 7a3f519eb89584149730065114d513f06829964d7b0a01debf42599c586250a04a8b26352e4ab099a696bc5e66bc365abaf110ae9bb411f738181fcaee07409d
+  data.tar.gz: 5844c839e5c9731782afd0323179c513d7c057d428e51d086b5bfda889ac0bf14fa2421bb3615075eabbb89d157eddfc95f4a6cc730ed443e339ce0b58d89903

data/README.md

@@ -1,6 +1,7 @@
 :abc: Polyglot
 ---
-version 1.2.0 [![Build Status](https://travis-ci.org/untra/polyglot.svg?branch=master)](https://travis-ci.org/untra/polyglot)
+[![Gem Version](https://badge.fury.io/rb/jekyll-polyglot.svg)](https://badge.fury.io/rb/jekyll-polyglot)
+[![Build Status](https://travis-ci.org/untra/polyglot.svg?branch=master)](https://travis-ci.org/untra/polyglot)
 
 __Polyglot__ is a fast, painless, open-source internationalization plugin for [Jekyll](http://jekyllrb.com) blogs. Polyglot is easy to setup and use with any Jekyll project, and it scales to the languages you want to support. With fallback support for missing content, automatic url relativization, and powerful SEO tools, Polyglot allows any multi-language jekyll blog to focus on content without the cruft.
 
@@ -11,7 +12,7 @@ Jekyll doesn't provide native support for multi-language blogs. This plugin was
 `gem install jekyll-polyglot` and add jekyll-polyglot to your `_config.yml` like the following:
 ```yml
 gems:
-  - jekyll-assets
+  - jekyll-polyglot
 ```
 
 ## Configuration
@@ -96,7 +97,7 @@ This plugin stands out from other I18n Jekyll plugins.
 - provides the liquid tag `{{ site.languages }}` to get an array of your I18n strings.
 - provides the liquid tag `{{ site.default_lang }}` to get the default_lang I18n string.
 - provides the liquid tag `{{ site.active_lang }}` to get the I18n language string the website was built for.
-- provides the liquid tag `{{ I18n-Headers https://yourwebsite.com/ }}` to append SEO bonuses to your website.
+- provides the liquid tag `{{ I18n_Headers https://yourwebsite.com/ }}` to append SEO bonuses to your website.
 - A creator that will answer all of your questions and issues.
 
 ## SEO Recipes

data/lib/jekyll/polyglot/patches/jekyll/site.rb

@@ -6,11 +6,11 @@ module Jekyll
 
     def prepare
       @file_langs = {}
-      @default_lang = config['default_lang'] || 'en'
-      @languages = config['languages'] || ['en']
-      @parallel_localization = config['parallel_localization'] || true
+      @default_lang = config.fetch('default_lang', 'en')
+      @languages = config.fetch('languages', ['en'])
+      @parallel_localization = config.fetch('parallel_localization', true)
       (@keep_files << @languages - [@default_lang]).flatten!
-      @exclude_from_localization = config['exclude_from_localization'] || []
+      @exclude_from_localization = config.fetch('exclude_from_localization', [])
       @active_lang = @default_lang
     end
 
@@ -58,9 +58,14 @@ module Jekyll
     end
 
     def process_active_language
+      old_dest = @dest
+      old_exclude = @exclude
+      @file_langs = {}
       @dest = @dest + '/' + @active_lang
       @exclude += @exclude_from_localization
       process_orig
+      @dest = old_dest
+      @exclude = old_exclude
     end
 
     # assigns natural permalinks to documents and prioritizes documents with
@@ -107,7 +112,7 @@ module Jekyll
       @exclude.each do |x|
         regex += "(?!#{x}\/)"
       end
-      %r{href=\"#{@baseurl}\/((?:#{regex}[^,'\"\s\/?\.#-]+\.?)*(?:\/[^\]\[\)\(\"\'\s]*)?)\"}
+      %r{href=\"#{@baseurl}\/((?:#{regex}[^,'\"\s\/?\.#]+\.?)*(?:\/[^\]\[\)\(\"\'\s]*)?)\"}
     end
 
     def relativize_urls(doc)

data/lib/jekyll/polyglot/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Polyglot
-    VERSION="1.2.0.pre.alpha"
+    VERSION="1.2.2"
   end
 end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-polyglot
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Samuel Volin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Fast open source i18n plugin for Jekyll blogs.
@@ -50,7 +50,6 @@ files:
 - lib/jekyll/polyglot/patches/jekyll/site.rb
 - lib/jekyll/polyglot/patches/jekyll/static_file.rb
 - lib/jekyll/polyglot/version.rb
-- lib/polyglot.rb
 homepage: http://untra.github.io/polyglot
 licenses:
 - MIT
@@ -61,17 +60,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.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: I18n plugin for Jekyll Blogs

data/lib/polyglot.rb

@@ -1,158 +0,0 @@
-# Jekyll Polyglot v1.2.0
-# Fast, painless, open source i18n plugin for Jekyll 3.0 Blogs.
-#   author: Samuel Volin (@untra)
-#   github: https://github.com/untra/polyglot
-#   license: MIT
-include Process
-module Jekyll
-  # Alteration to Jekyll Site class
-  # provides aliased methods to direct site.write to output into seperate
-  # language folders
-  class Site
-    attr_reader :default_lang, :languages, :exclude_from_localization
-    attr_accessor :file_langs, :active_lang
-
-    def prepare
-      @file_langs = {}
-      @default_lang = config['default_lang'] || 'en'
-      @languages = config['languages'] || ['en']
-      @parallel_localization = config['parallel_localization'] || true
-      (@keep_files << @languages - [@default_lang]).flatten!
-      @exclude_from_localization = config['exclude_from_localization'] || []
-      @active_lang = @default_lang
-    end
-
-    alias_method :process_orig, :process
-    def process
-      prepare
-      if @parallel_localization
-        pids = {}
-        languages.each do |lang|
-          pids[lang] = fork do
-            process_language lang
-          end
-        end
-        Signal.trap('INT') do
-          languages.each do |lang|
-            puts "Killing #{pids[lang]} : #{lang}"
-            kill('INT', pids[lang])
-          end
-        end
-        languages.each do |lang|
-          waitpid pids[lang]
-          detach pids[lang]
-        end
-      else
-        languages.each do |lang|
-          process_language lang
-        end
-      end
-    end
-
-    alias_method :site_payload_orig, :site_payload
-    def site_payload
-      payload = site_payload_orig
-      payload['site']['default_lang'] = default_lang
-      payload['site']['languages'] = languages
-      payload['site']['active_lang'] = active_lang
-      payload
-    end
-
-    def process_language(lang)
-      @active_lang = lang
-      config['active_lang'] = @active_lang
-      return process_orig if @active_lang == @default_lang
-      process_active_language
-    end
-
-    def process_active_language
-      @dest = @dest + '/' + @active_lang
-      @exclude += @exclude_from_localization
-      process_orig
-    end
-
-    # assigns natural permalinks to documents and prioritizes documents with
-    # active_lang languages over others
-    def coordinate_documents(docs)
-      regex = document_url_regex
-      approved = {}
-      docs.each do |doc|
-        lang = doc.data['lang'] || @default_lang
-        url = doc.url.gsub(regex, '/')
-        doc.data['permalink'] = url
-        next if @file_langs[url] == @active_lang
-        next if @file_langs[url] == @default_lang && lang != @active_lang
-        approved[url] = doc
-        @file_langs[url] = lang
-      end
-      approved.values
-    end
-
-    # performs any necesarry operations on the documents before rendering them
-    def process_documents(docs)
-      docs.each do |doc|
-        relativize_urls doc
-      end
-    end
-
-    # a regex that matches urls or permalinks with i18n prefixes or suffixes
-    # matches /en/foo , .en/foo , foo.en/ and other simmilar default urls
-    # made by jekyll when parsing documents without explicitly set permalinks
-    def document_url_regex
-      regex = ''
-      @languages.each do |lang|
-        regex += "([\/\.]#{lang}[\/\.])|"
-      end
-      regex.chomp! '|'
-      %r{#{regex}}
-    end
-
-    # a regex that matches relative urls in a html document
-    # matches href="baseurl/foo/bar-baz" and others like it
-    def relative_url_regex
-      regex = ''
-      @exclude.each do |x|
-        regex += "(?!#{x}\/)"
-      end
-      # regex that looks for all relative urls except for excluded files
-      %r{href=\"#{@baseurl}\/((?:#{regex}[^,'\"\s\/?\.#-]+\.?)*(?:\/[^\]\[\)\(\"\'\s]*)?)\"}
-    end
-
-    def relativize_urls(doc)
-      return if @active_lang == @default_lang
-      doc.output.gsub!(relative_url_regex, "href=\"#{@baseurl}/#{@active_lang}/" + '\1"')
-    end
-
-    # hook to coordinate blog posts and pages into distinct urls,
-    # and remove duplicate multilanguage posts and pages
-    Jekyll::Hooks.register :site, :post_read do |site|
-      site.posts.docs = site.coordinate_documents(site.posts.docs)
-      site.pages = site.coordinate_documents(site.pages)
-    end
-
-    # hook to make a call to process rendered documents,
-    Jekyll::Hooks.register :site, :post_render do |site|
-      site.process_documents(site.posts.docs)
-      site.process_documents(site.pages)
-    end
-  end
-
-  # Alteration to Jekyll StaticFile
-  # provides aliased methods to direct write to skip files
-  # excluded from localization
-  class StaticFile
-    alias_method :write_orig, :write
-    def write(dest)
-      return false if exclude_from_localization?
-      write_orig(dest)
-    end
-
-    def exclude_from_localization?
-      return false if @site.active_lang == @site.default_lang
-      @site.exclude_from_localization.each do |e|
-        return true if relative_path[1..-1].start_with?(e)
-      end
-      false
-    end
-  end
-end