jekyll-language-plugin 1.1.4 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffc4661d6aa87c92218872d982a6930d69132d1b
-  data.tar.gz: 4248aeb04ae839ce437c3fb25d1cd97c886317ce
+  metadata.gz: 76a39471fe7e6ad748b7ddf255a6c254e4cb11c4
+  data.tar.gz: 7a1af5612ba9cc46c054bc19344bbefdcf1b2b0e
 SHA512:
-  metadata.gz: fcb4dd807bdecbbbd307a2efd1d78caa3b28d8af0301609750f8f5554509cb7a6de8c7aa76414d26c1e5a4d6844018e3b10ea90acce97fe209e8c886abc7d3f0
-  data.tar.gz: b22e65ac61d034a2fddbaff5f704cb8ae2a122dedc803f7031fca2805bc49240844ed265d25822d4a80fc7c6d2aecaff71b9d20192bf8d05453694b814afb435
+  metadata.gz: 88d6e2795d11668a803166accdc6b167f290464ffd94202ccbc5bd96f7671d289b05607c051a574706205ae26e059256d60788764ec35f9cc20ba6200ed54fcb
+  data.tar.gz: 1e9cdec599cf6801c27446668424b9893f0250b3d924298c4f04aafadbc7e72ccd26b17747beb0bf1cb2efad13e98b04cdf7f3b2f67e2b3ba3bb799c233e8041

data/lib/jekyll-language-plugin.rb

@@ -1,18 +1,25 @@
-# require all files in jekyll-language-plugin subdirectory
-require 'jekyll-language-plugin/plugin_exception.rb'
-require 'jekyll-language-plugin/liquid_context.rb'
-require 'jekyll-language-plugin/date_localizer.rb'
+module Jekyll
+
+  # internal requires for plugin
+  autoload :LanguageReader,     'jekyll/language_reader.rb'
+  autoload :LanguagePage,       'jekyll/language_page.rb'
+  autoload :LanguageDocument,   'jekyll/language_document.rb'
+  autoload :LanguagePageReader, 'jekyll/readers/language_page_reader.rb'
+  autoload :LanguagePostReader, 'jekyll/readers/language_post_reader.rb'
 
-# require all files in jekyll subdirectory
-require 'jekyll/language_reader.rb'
-require 'jekyll/language_page.rb'
-require 'jekyll/language_document.rb'
-require 'jekyll/readers/language_page_reader.rb'
-require 'jekyll/readers/language_post_reader.rb'
-require 'jekyll/filters/language_date.rb'
-require 'jekyll/tags/language.rb'
-require 'jekyll/tags/language_name.rb'
-require 'jekyll/tags/language_include.rb'
+  module LanguagePlugin
+
+    # plugin requires
+    autoload :PluginError,        'jekyll/language-plugin/plugin_error.rb'
+    autoload :LiquidContext,      'jekyll/language-plugin/liquid_context.rb'
+    autoload :DateLocalizer,      'jekyll/language-plugin/date_localizer.rb'
+    autoload :VERSION,            'jekyll/language-plugin/version'
+  end
+end
+
+# require liquid tags and filters
+Dir[File.join(File.dirname(__FILE__), 'jekyll/language-plugin/tags/*.rb')].each{ |f| require f }
+require 'jekyll/language-plugin/filters/language_date.rb'
 
 # replace Jekyll::Reader upon page reset with Jekyll::LanguageReader extension
 Jekyll::Hooks.register :site, :after_reset do |site|
@@ -22,17 +29,9 @@ end
 # monkey patch URL.sanitize_url for handling of triple slashes
 module Jekyll
   class URL
-    def sanitize_url(in_url)
-      url = in_url \
-        # Remove empty URL segments and every URL segment that consists solely of dots
-        .split('/').reject{ |s| s.empty? || s =~ /^\.+$/ }.join('/') \
-        # Always add a leading slash
-        .gsub(/\A([^\/])/, '/\1')
-
-      # Append a trailing slash to the URL if the unsanitized URL had one
-      url << "/" if in_url.end_with?("/")
-      
-      url
+    # optimized version by Jordon Bedwell
+    def sanitize_url(str)
+      "/" + str.gsub(/\/{2,}/, "/").gsub(%r!\.+\/|\A/+!, "")
     end
   end
 end

data/lib/jekyll/language-plugin/date_localizer.rb

@@ -0,0 +1,41 @@
+module Jekyll
+  module LanguagePlugin
+    module DateLocalizer
+      def self.localize_date(date, format, context)
+        translation = Jekyll::LanguagePlugin::LiquidContext.get_language_data(context, 'date')
+
+        # validate language translation
+        raise Jekyll::LanguagePlugin::PluginError.new('Localized date is missing translation.') if translation.nil? ||
+          !['abbr_daynames', 'daynames', 'abbr_monthnames', 'monthnames'].all? {|s| translation.key?(s) && translation[s].is_a?(Array) } ||
+          translation['abbr_daynames'].size < 7 || translation['daynames'].size < 7 ||
+          translation['abbr_monthnames'].size < 12 || translation['monthnames'].size < 12
+
+        #convert to extended Time class
+        date2 = JLPTime.at(date.to_i)
+        date2.strftime_translate(format, translation)
+      end
+
+      class JLPTime < Time
+        def strftime_translate(format = '%F', translation)
+          result = self.strftime(
+            #...you replaced the language dependent parts.
+            format.gsub(/%([aAbB])/){ |m|
+                case $1
+                  when 'a'; translation['abbr_daynames'][self.wday]
+                  when 'A'; translation['daynames'][self.wday]
+                  when 'b'; translation['abbr_monthnames'][self.mon-1]
+                  when 'B'; translation['monthnames'][self.mon-1]
+                  else
+                    raise Jekyll::LanguagePlugin::PluginError.new('Internal error.')
+                end
+              })
+          if defined? @@encoding_converter
+            @@encoding_converter.iconv(result)
+          else
+            result
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/language-plugin/filters/language_date.rb

@@ -0,0 +1,32 @@
+module Jekyll
+  module LanguagePlugin
+    module Filters
+      module LanguageDateFilter
+        def tdate(input, fkey)
+          if ((input.is_a?(String) && !/^\d+$/.match(input).nil?) || input.is_a?(Integer)) && input.to_i > 0
+            date = Time.at(input.to_i)
+          elsif input.is_a?(String)
+            case input.downcase
+            when 'now', 'today'
+              date = Time.now
+            else
+              date = Time.parse(input)
+            end
+          elsif input.is_a?(Time)
+            date = input
+          else
+            date = nil
+          end
+
+          return "" if !date.is_a?(Time)
+          format = LiquidContext.get_language_string(@context, fkey)
+          return "" if format.nil?
+
+          Jekyll::LanguagePlugin::DateLocalizer.localize_date(date, format, @context).to_s
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::LanguagePlugin::Filters::LanguageDateFilter)

data/lib/jekyll/language-plugin/liquid_context.rb

@@ -0,0 +1,62 @@
+module Jekyll
+  module LanguagePlugin
+    module LiquidContext
+      def self.get_language_data(context, keys = nil)
+        site = context.registers[:site]
+        language_data = site.config['language_data'].to_s || 'data.lang.%%'
+
+        page_language = context.registers[:page]['language']
+        return nil if page_language.to_s.empty?
+
+        keys2 = language_data.gsub("%%", page_language).split('.')
+        language_data = site.send(keys2.shift)
+        language_data = self.traverse_hash(language_data, keys2)
+        raise Jekyll::LanguagePlugin::PluginError.new('Invalid language data configuration.') if language_data.nil?
+
+        return language_data if keys.to_s.empty? # can also return nil
+
+        language_data = self.traverse_hash(language_data, keys)
+        raise Jekyll::LanguagePlugin::PluginError.new("Language subset #{keys.to_s} not found.") if language_data.nil?
+        language_data
+      end
+
+      def self.get_language_string(context, key)
+        data = self.get_language_data(context)
+        return "" if data.nil?
+
+        language_subset = context.registers[:page]['subset']
+        if (!language_subset.to_s.empty? &&
+            !(str = traverse_hash(traverse_hash(data, language_subset), key)).to_s.empty?) ||
+           !(str = traverse_hash(data, key)).to_s.empty?
+          return str
+        end
+
+        raise Jekyll::LanguagePlugin::PluginError.new("Language string #{key} not found.")
+      end
+
+      def self.get_language_name(context, name)
+        translation = self.get_language_data(context, 'lang')
+
+        raise Jekyll::LanguagePlugin::PluginError.new('Language name not found in translation.') if translation.nil? ||
+          !translation.key?(name)
+
+        translation[name]
+      end
+
+      def self.traverse_hash(hash, keys)
+        return nil if hash.nil? || keys.to_s.empty?
+        keys = keys.split('.') if keys.is_a?(String)
+
+        for key in keys
+          if !hash.is_a?(Hash)
+            return hash
+          elsif !hash.key?(key)
+            return nil
+          end
+          hash = hash[key]
+        end
+        hash
+      end
+    end
+  end
+end

data/lib/jekyll/language-plugin/plugin_error.rb

@@ -0,0 +1,6 @@
+module Jekyll
+  module LanguagePlugin
+    class PluginError < RuntimeError
+    end
+  end
+end

data/lib/jekyll/language-plugin/tags/language.rb

@@ -0,0 +1,36 @@
+module Jekyll
+  module LanguagePlugin
+    module Tags
+      class LanguageTag < Liquid::Tag
+        def initialize(tag_name, markup, tokens)
+          super
+          @markup = markup
+        end
+
+        def render(context)
+          p = Liquid::Parser.new(@markup)
+          name = Liquid::Expression.parse(exp = p.expression)
+          key = context.evaluate(name)
+          raise Liquid::SyntaxError.new("Invalid language key expression: #{exp}") if key.nil?
+
+          # get language string from evaluated key
+          str = Jekyll::LanguagePlugin::LiquidContext.get_language_string(context, key)
+
+          if p.consume?(:colon)
+            loop do
+              arg = Liquid::Expression.parse(exp = p.expression)
+              argstr = context.evaluate(arg)
+              raise Liquid::SyntaxError.new("Invalid parameter expression: #{exp}") if argstr.nil?
+              raise Jekyll::LanguagePlugin::PluginError.new("Language string is lacking parameter placeholder.") unless str.include?("%%")
+              str.sub!("%%", argstr)
+              break if !p.consume?(:comma)
+            end
+          end
+          str
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('t', Jekyll::LanguagePlugin::Tags::LanguageTag)

data/lib/jekyll/language-plugin/tags/language_include.rb

@@ -0,0 +1,21 @@
+module Jekyll
+  module LanguagePlugin
+    module Tags
+      class LanguageIncludeTag < Jekyll::Tags::IncludeTag
+        def tag_includes_dir(context)
+          (context.registers[:site].config['language_includes_dir'].to_s || '_i18n').freeze
+        end
+
+        def page_language(context)
+            context.registers[:page].nil? ? "." : context.registers[:page]["language"]
+        end
+
+        def resolved_includes_dir(context)
+          File.join(context.registers[:site].in_source_dir(@includes_dir), page_language(context))
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('tinclude', Jekyll::LanguagePlugin::Tags::LanguageIncludeTag)

data/lib/jekyll/language-plugin/tags/language_name.rb

@@ -0,0 +1,24 @@
+module Jekyll
+  module LanguagePlugin
+    module Tags
+      class LanguageNameTag < Liquid::Tag
+        def initialize(tag_name, markup, tokens)
+          super
+          @markup = markup
+        end
+
+        def render(context)
+          p = Liquid::Parser.new(@markup)
+          name = Liquid::Expression.parse(exp = p.expression)
+          key = context.evaluate(name)
+          raise Liquid::SyntaxError.new("Invalid language key expression: #{exp}") if key.nil?
+
+          # get language name string from evaluated key
+          Jekyll::LanguagePlugin::LiquidContext.get_language_string(context, "lang.#{key}")
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('tl', Jekyll::LanguagePlugin::Tags::LanguageNameTag)

data/lib/jekyll/language-plugin/version.rb

@@ -0,0 +1,5 @@
+module Jekyll
+  module LanguagePlugin
+    VERSION = '1.1.7'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-language-plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.7
 platform: ruby
 authors:
 - Vincent Wochnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -74,18 +74,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-language-plugin.rb
-- lib/jekyll/filters/language_date.rb
+- lib/jekyll/language-plugin/date_localizer.rb
+- lib/jekyll/language-plugin/filters/language_date.rb
+- lib/jekyll/language-plugin/liquid_context.rb
+- lib/jekyll/language-plugin/plugin_error.rb
+- lib/jekyll/language-plugin/tags/language.rb
+- lib/jekyll/language-plugin/tags/language_include.rb
+- lib/jekyll/language-plugin/tags/language_name.rb
+- lib/jekyll/language-plugin/version.rb
 - lib/jekyll/language_document.rb
 - lib/jekyll/language_page.rb
 - lib/jekyll/language_reader.rb
 - lib/jekyll/readers/language_page_reader.rb
 - lib/jekyll/readers/language_post_reader.rb
-- lib/jekyll/tags/language.rb
-- lib/jekyll/tags/language_include.rb
-- lib/jekyll/tags/language_name.rb
-- lib/jekyll-language-plugin/date_localizer.rb
-- lib/jekyll-language-plugin/liquid_context.rb
-- lib/jekyll-language-plugin/plugin_exception.rb
 - README.md
 - LICENSE.md
 homepage: https://github.com/vwochnik/jekyll-language-plugin

data/lib/jekyll-language-plugin/date_localizer.rb

@@ -1,39 +0,0 @@
-module JekyllLanguagePlugin
-  module DateLocalizer
-    def self.localize_date(date, format, context)
-      translation = JekyllLanguagePlugin::LiquidContext.get_language_data(context, 'date')
-
-      # validate language translation
-      raise JekyllLanguagePlugin::PluginError.new('Localized date is missing translation.') if translation.nil? ||
-        !['abbr_daynames', 'daynames', 'abbr_monthnames', 'monthnames'].all? {|s| translation.key?(s) && translation[s].is_a?(Array) } ||
-        translation['abbr_daynames'].size < 7 || translation['daynames'].size < 7 ||
-        translation['abbr_monthnames'].size < 12 || translation['monthnames'].size < 12
-
-      #convert to extended Time class
-      date2 = JLPTime.at(date.to_i)
-      date2.strftime_translate(format, translation)
-    end
-
-    class JLPTime < Time
-      def strftime_translate(format = '%F', translation)
-        result = self.strftime(
-          #...you replaced the language dependent parts.
-          format.gsub(/%([aAbB])/){ |m|
-              case $1
-                when 'a'; translation['abbr_daynames'][self.wday]
-                when 'A'; translation['daynames'][self.wday]
-                when 'b'; translation['abbr_monthnames'][self.mon-1]
-                when 'B'; translation['monthnames'][self.mon-1]
-                else
-                  raise JekyllLanguagePlugin::PluginError.new('Internal error.')
-              end
-            })
-        if defined? @@encoding_converter
-          @@encoding_converter.iconv(result)
-        else
-          result
-        end
-      end
-    end
-  end
-end

data/lib/jekyll-language-plugin/liquid_context.rb

@@ -1,60 +0,0 @@
-module JekyllLanguagePlugin
-  module LiquidContext
-    def self.get_language_data(context, keys = nil)
-      site = context.registers[:site]
-      language_data = site.config['language_data'].to_s || 'data.lang.%%'
-
-      page_language = context.registers[:page]['language']
-      return nil if page_language.to_s.empty?
-
-      keys2 = language_data.gsub("%%", page_language).split('.')
-      language_data = site.send(keys2.shift)
-      language_data = self.traverse_hash(language_data, keys2)
-      raise JekyllLanguagePlugin::PluginError.new('Invalid language data configuration.') if language_data.nil?
-
-      return language_data if keys.to_s.empty? # can also return nil
-
-      language_data = self.traverse_hash(language_data, keys)
-      raise JekyllLanguagePlugin::PluginError.new("Language subset #{keys.to_s} not found.") if language_data.nil?
-      language_data
-    end
-
-    def self.get_language_string(context, key)
-      data = self.get_language_data(context)
-      return "" if data.nil?
-
-      language_subset = context.registers[:page]['subset']
-      if (!language_subset.to_s.empty? &&
-          !(str = traverse_hash(traverse_hash(data, language_subset), key)).to_s.empty?) ||
-         !(str = traverse_hash(data, key)).to_s.empty?
-        return str
-      end
-
-      raise JekyllLanguagePlugin::PluginError.new("Language string #{key} not found.")
-    end
-
-    def self.get_language_name(context, name)
-      translation = self.get_language_data(context, 'lang')
-
-      raise JekyllLanguagePlugin::PluginError.new('Language name not found in translation.') if translation.nil? ||
-        !translation.key?(name)
-
-      translation[name]
-    end
-
-    def self.traverse_hash(hash, keys)
-      return nil if hash.nil? || keys.to_s.empty?
-      keys = keys.split('.') if keys.is_a?(String)
-
-      for key in keys
-        if !hash.is_a?(Hash)
-          return hash
-        elsif !hash.key?(key)
-          return nil
-        end
-        hash = hash[key]
-      end
-      hash
-    end
-  end
-end

data/lib/jekyll-language-plugin/plugin_exception.rb

@@ -1,4 +0,0 @@
-module JekyllLanguagePlugin
-  class PluginError < RuntimeError
-  end
-end

data/lib/jekyll/filters/language_date.rb

@@ -1,30 +0,0 @@
-module Jekyll
-  module Filters
-    module LanguageDate
-      def tdate(input, fkey)
-        if ((input.is_a?(String) && !/^\d+$/.match(input).nil?) || input.is_a?(Integer)) && input.to_i > 0
-          date = Time.at(input.to_i)
-        elsif input.is_a?(String)
-          case input.downcase
-          when 'now', 'today'
-            date = Time.now
-          else
-            date = Time.parse(input)
-          end
-        elsif input.is_a?(Time)
-          date = input
-        else
-          date = nil
-        end
-
-        return "" if !date.is_a?(Time)
-        format = JekyllLanguagePlugin::LiquidContext.get_language_string(@context, fkey)
-        return "" if format.nil?
-
-        JekyllLanguagePlugin::DateLocalizer.localize_date(date, format, @context).to_s
-      end
-    end
-  end
-end
-
-Liquid::Template.register_filter(Jekyll::Filters::LanguageDate)

data/lib/jekyll/tags/language.rb

@@ -1,34 +0,0 @@
-module Jekyll
-  module Tags
-    class LanguageTag < Liquid::Tag
-      def initialize(tag_name, markup, tokens)
-        super
-        @markup = markup
-      end
-
-      def render(context)
-        p = Liquid::Parser.new(@markup)
-        name = Liquid::Expression.parse(exp = p.expression)
-        key = context.evaluate(name)
-        raise Liquid::SyntaxError.new("Invalid language key expression: #{exp}") if key.nil?
-
-        # get language string from evaluated key
-        str = JekyllLanguagePlugin::LiquidContext.get_language_string(context, key)
-
-        if p.consume?(:colon)
-          loop do
-            arg = Liquid::Expression.parse(exp = p.expression)
-            argstr = context.evaluate(arg)
-            raise Liquid::SyntaxError.new("Invalid parameter expression: #{exp}") if argstr.nil?
-            raise JekyllLanguagePlugin::PluginError.new("Language string is lacking parameter placeholder.") unless str.include?("%%")
-            str.sub!("%%", argstr)
-            break if !p.consume?(:comma)
-          end
-        end
-        str
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag('t', Jekyll::Tags::LanguageTag)

data/lib/jekyll/tags/language_include.rb

@@ -1,19 +0,0 @@
-module Jekyll
-  module Tags
-    class LanguageIncludeTag < IncludeTag
-      def tag_includes_dir(context)
-        (context.registers[:site].config['language_includes_dir'].to_s || '_i18n').freeze
-      end
-
-      def page_language(context)
-          context.registers[:page].nil? ? "en" : context.registers[:page]["language"]
-      end
-
-      def resolved_includes_dir(context)
-        File.join(context.registers[:site].in_source_dir(@includes_dir), page_language(context))
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag('tinclude', Jekyll::Tags::LanguageIncludeTag)

data/lib/jekyll/tags/language_name.rb

@@ -1,22 +0,0 @@
-module Jekyll
-  module Tags
-    class LanguageNameTag < Liquid::Tag
-      def initialize(tag_name, markup, tokens)
-        super
-        @markup = markup
-      end
-
-      def render(context)
-        p = Liquid::Parser.new(@markup)
-        name = Liquid::Expression.parse(exp = p.expression)
-        key = context.evaluate(name)
-        raise Liquid::SyntaxError.new("Invalid language key expression: #{exp}") if key.nil?
-
-        # get language name string from evaluated key
-        JekyllLanguagePlugin::LiquidContext.get_language_string(context, "lang.#{key}")
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag('tl', Jekyll::Tags::LanguageNameTag)