jekyll-language-plugin 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 474a7a7e024e8fdae812794d6970da82887655c2
-  data.tar.gz: 4a8f30df701b2530cda2ce3339a95bb234983a25
+  metadata.gz: efc4684030b0b9565cbb4bbf8d14dbd632bf7fd2
+  data.tar.gz: bacc98469b5dc3315cbac9e7c2c12a8d4740f7b7
 SHA512:
-  metadata.gz: b029db16f1aa3a05c7e4d60a0d60d849bdac2ca87541cdea1d71308c71d5c336b841642f750b52261e62e11438f75026d4cd242e54fbdb27ead31789fee6d635
-  data.tar.gz: 5146e49851e0bd2e50bc124e446c4ee41faae2cf992f1854784cac6d848c0637746fe440b43b2e7680b3978bc8cf99aeab5577ce3b557abcaef8b2daf71319cd
+  metadata.gz: a87f90185e2ab6991395a5250b5699b9e6f23ae923bdc91c883d3dab423aeca59d3abe2bd8177a0042016d9a99b038d7d36db828f6ade326fe2d2aa7e05fab03
+  data.tar.gz: ddc18a8cc3f387876d838fea2e724d0994e85fb170386e74e216134d17cc4262d3e8c16c75a61c23b4d8caa308a2c58da90ca347d9be8343714a3a60e7a34eba

data/lib/jekyll-language-plugin.rb

@@ -1,61 +1,22 @@
-module Jekyll
+# Frozen-string-literal: true
+# Encoding: utf-8
 
-  # internal requires for plugin
-  autoload :LanguageReader,     'jekyll/language_reader.rb'
-  autoload :LanguageProperties, 'jekyll/language_properties.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 'jekyll'
 
-  module LanguagePlugin
-
-    # plugin requires
-    autoload :PluginError,        'jekyll/language-plugin/plugin_error.rb'
-    autoload :LanguageData,       'jekyll/language-plugin/language_data.rb'
-    autoload :LiquidContext,      'jekyll/language-plugin/liquid_context.rb'
-    autoload :DateLocalizer,      'jekyll/language-plugin/date_localizer.rb'
-    autoload :VERSION,            'jekyll/language-plugin/version'
-
-    module Loaders
-      autoload :BaseLoader,       'jekyll/language-plugin/loaders/base_loader.rb'
-    end
-
-    class << self
-      def register_loader(loader)
-        LanguageData.register_loader(loader)
-      end
-    end
-  end
-end
-
-# require data built-in loaders
-require 'jekyll/language-plugin/loaders/jekyll_data_loader.rb'
-require 'jekyll/language-plugin/loaders/builtin_data_loader.rb'
-
-# 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'
+require_relative 'jekyll/language_reader.rb'
+require_relative 'jekyll/language_properties.rb'
+require_relative 'jekyll/language_page.rb'
+require_relative 'jekyll/language_document.rb'
+require_relative 'jekyll/readers/language_collection_reader.rb'
+require_relative 'jekyll/readers/language_page_reader.rb'
+require_relative 'jekyll/readers/language_post_reader.rb'
+require_relative 'jekyll/patches'
+require_relative 'jekyll/language-plugin'
 
 Jekyll::Hooks.register :site, :after_reset do |site|
   # replace Jekyll::Reader with Jekyll::LanguageReader extension
   site.reader = Jekyll::LanguageReader.new(site)
 
-  # add dynamic languageData property
-  unless site.respond_to?(:languageData) && site.respond_to?(:languageData=)
-    site.class.module_eval { attr_accessor :languageData }
-  end
-
   # create new language data instance
   site.languageData = Jekyll::LanguagePlugin::LanguageData.new(site)
 end
-
-# monkey patch URL.sanitize_url for handling of triple slashes
-module Jekyll
-  class URL
-    # optimized version by Jordon Bedwell
-    def sanitize_url(str)
-      "/" + str.gsub(/\/{2,}/, "/").gsub(%r!\.+\/|\A/+!, "")
-    end
-  end
-end

data/lib/jekyll/language-plugin.rb

@@ -0,0 +1,24 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
+module Jekyll
+  module LanguagePlugin
+
+    # plugin requires
+    require_relative 'language-plugin/plugin_error'
+    require_relative 'language-plugin/language_data'
+    require_relative 'language-plugin/liquid_context'
+    require_relative 'language-plugin/date_localizer'
+    require_relative  'language-plugin/version'
+
+    class << self
+      def register_loader(loader)
+        LanguageData.register_loader(loader)
+      end
+    end
+
+    require_relative 'language-plugin/loaders'
+    require_relative 'language-plugin/tags'
+    require_relative 'language-plugin/filters'
+  end
+end

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

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     class DateLocalizer

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

@@ -0,0 +1,10 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
+module Jekyll
+  module LanguagePlugin
+    module Filters
+      require_relative 'filters/language_date'
+    end
+  end
+end

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

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     module Filters

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

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     class LanguageData
@@ -9,18 +12,18 @@ module Jekyll
       end
 
       def get(key, language)
-        inject_loaders(language) do |result, loader|
+        inject_loader(language) do |loader|
           loader.get(key, language)
         end
       end
 
       def get_with_placeholders(key, tokens, language)
-        inject_loaders(language) do |result, loader|
+        inject_loader(language) do |loader|
           loader.get_with_placeholders(key, tokens, language)
         end
       end
 
-      def inject_loaders(language)
+      def inject_loader(language)
         self.class.loaders.inject(nil) do |result, loader|
           unless l_inst = @l_inst_ary.detect { |l| l.is_a?(loader) }
             l_inst = loader.new(@site)
@@ -28,7 +31,7 @@ module Jekyll
           end
 
           l_inst.load(language) unless l_inst.loaded?(language)
-          result = yield result, l_inst
+          result = yield l_inst
           break result unless result.nil?
         end
       end

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

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     module LiquidContext

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

@@ -0,0 +1,12 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
+module Jekyll
+  module LanguagePlugin
+    module Loaders
+      require_relative 'loaders/base_loader.rb'
+      require_relative 'loaders/jekyll_data_loader.rb'
+      require_relative 'loaders/builtin_data_loader.rb'
+    end
+  end
+end

data/lib/jekyll/language-plugin/loaders/base_loader.rb

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     module Loaders

data/lib/jekyll/language-plugin/loaders/builtin_data_loader.rb

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 require 'rubygems'
 require 'yaml'
 
@@ -35,5 +38,4 @@ module Jekyll
   end
 end
 
-$stdout.puts("Registering!")
 Jekyll::LanguagePlugin.register_loader(Jekyll::LanguagePlugin::Loaders::BuiltinDataLoader)

data/lib/jekyll/language-plugin/loaders/jekyll_data_loader.rb

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     module Loaders

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

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     class PluginError < RuntimeError

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

@@ -0,0 +1,12 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
+module Jekyll
+  module LanguagePlugin
+    module Tags
+      require_relative 'tags/language'
+      require_relative 'tags/language_include'
+      require_relative 'tags/language_name'
+    end
+  end
+end

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

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     module Tags

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

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     module Tags

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

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
     module Tags

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

@@ -1,5 +1,8 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguagePlugin
-    VERSION = '1.2.3'
+    VERSION = '1.3.0'
   end
 end

data/lib/jekyll/language_document.rb

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   class LanguageDocument < Document
     include LanguageProperties

data/lib/jekyll/language_page.rb

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   class LanguagePage < Page
     include LanguageProperties

data/lib/jekyll/language_properties.rb

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module LanguageProperties
     def language

data/lib/jekyll/language_reader.rb

@@ -1,5 +1,16 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   class LanguageReader < Reader
+    def read
+      @site.layouts = LayoutReader.new(site).read
+      read_directories
+      sort_files!
+      @site.data = DataReader.new(site).read(site.config['data_dir'])
+      LanguageCollectionReader.new(site).read
+    end
+
     def retrieve_posts(dir)
       site.posts.docs.concat(LanguagePostReader.new(site).read_posts(dir))
       site.posts.docs.concat(LanguagePostReader.new(site).read_drafts(dir)) if site.show_drafts

data/lib/jekyll/patches.rb

@@ -0,0 +1,5 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
+require_relative 'patches/jekyll/site'
+require_relative 'patches/jekyll/url'

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

@@ -0,0 +1,8 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
+module Jekyll
+  class Site
+    attr_accessor :languageData
+  end
+end

data/lib/jekyll/patches/jekyll/url.rb

@@ -0,0 +1,11 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
+module Jekyll
+  class URL
+    # optimized version by Jordon Bedwell
+    def sanitize_url(str)
+      "/" + str.gsub(/\/{2,}/, "/").gsub(%r!\.+\/|\A/+!, "")
+    end
+  end
+end

data/lib/jekyll/readers/language_collection_reader.rb

@@ -0,0 +1,39 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
+module Jekyll
+  class LanguageCollectionReader < CollectionReader
+    def read
+      site.collections.each do |_, collection|
+        collection.read unless SPECIAL_COLLECTIONS.include?(collection.label)
+        collection.docs = collection.docs.flat_map do |document|
+          ldocuments = []
+          ldocument = LanguageDocument.new(document.path, { site: @site, collection: collection })
+          ldocument.read
+
+          if ldocument.languages
+            for language in ldocument.languages do
+              if ldocument.language == language
+                ldocuments << ldocument
+              elsif ldocument.language.nil?
+                ldocument.data['language'] = language
+                ldocuments << ldocument
+              else
+                ldocument2 = LanguageDocument.new(document.path, { site: @site, collection: collection })
+                ldocument2.read
+                ldocument2.data['language'] = language
+                ldocuments << ldocument2
+              end
+            end
+          elsif ldocument.language
+            ldocuments << ldocument
+          else
+            # no languages -> do not add extended Page
+            ldocuments << document
+          end
+          ldocuments
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/readers/language_page_reader.rb

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   class LanguagePageReader < PageReader
     alias_method :read_orig, :read

data/lib/jekyll/readers/language_post_reader.rb

@@ -1,3 +1,6 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   class LanguagePostReader < PostReader
     alias_method :read_content_orig, :read_content

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-language-plugin
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Vincent Wochnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -76,20 +76,28 @@ files:
 - lib/jekyll-language-plugin.rb
 - lib/jekyll/language-plugin/date_localizer.rb
 - lib/jekyll/language-plugin/filters/language_date.rb
+- lib/jekyll/language-plugin/filters.rb
 - lib/jekyll/language-plugin/language_data.rb
 - lib/jekyll/language-plugin/liquid_context.rb
 - lib/jekyll/language-plugin/loaders/base_loader.rb
 - lib/jekyll/language-plugin/loaders/builtin_data_loader.rb
 - lib/jekyll/language-plugin/loaders/jekyll_data_loader.rb
+- lib/jekyll/language-plugin/loaders.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/tags.rb
 - lib/jekyll/language-plugin/version.rb
+- lib/jekyll/language-plugin.rb
 - lib/jekyll/language_document.rb
 - lib/jekyll/language_page.rb
 - lib/jekyll/language_properties.rb
 - lib/jekyll/language_reader.rb
+- lib/jekyll/patches/jekyll/site.rb
+- lib/jekyll/patches/jekyll/url.rb
+- lib/jekyll/patches.rb
+- lib/jekyll/readers/language_collection_reader.rb
 - lib/jekyll/readers/language_page_reader.rb
 - lib/jekyll/readers/language_post_reader.rb
 - data/lang/bg.yml