jekyll-language-plugin 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7f81d9c518d3a746e3d3e2df8f113bbf32ecb0
-  data.tar.gz: babaab48e38c83dd620960f2756234e55c372e59
+  metadata.gz: 18a4c1437ec41d016a655990c7dd40086db5eed3
+  data.tar.gz: 080a094139c5372c70dd659bd6e5bbae6ae5e9ed
 SHA512:
-  metadata.gz: a315f32074df59365490a7a529b22a31c4cf129d1f5c3366d520459def13ef5c4e8be35ca3d74ca47a7683383913a1e3aa1122f859156a521c26d71b564ecb81
-  data.tar.gz: 6a68495e25db78915703815362da6aae5981868d6b91255cae165c2a25ccfc23f509e1b3342c9660ab056457e8c8485be08cb49e840d8beff0dacbec71a1c544
+  metadata.gz: 01a89b8faf0b802df025daa1712b44f788eecad67029394e3cf76be8c91f3ae91df9f0c945d61a4141145eecb60d7739799fc5dce9ced3de50a27d65a47bd4bb
+  data.tar.gz: 6619b1f2f0fe8029b4c742a02ebedd1ebe4004a237746b9b75a562af2e077006a3ba9c7db61a2c62ed64e2cc30f4292e508e51642b8441a7f1c6d2a0706d1864

data/lib/jekyll-language-plugin.rb

@@ -1,7 +1,13 @@
 # require all files in jekyll subdirectory
-require 'jekyll-language-plugin/language_page.rb'
-require 'jekyll-language-plugin/language_document.rb'
-require 'jekyll-language-plugin/readers/page_reader.rb'
-require 'jekyll-language-plugin/readers/post_reader.rb'
-require 'jekyll-language-plugin/tags/language.rb'
-require 'jekyll-language-plugin/tags/language_include.rb'
+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/tags/language.rb'
+require 'jekyll/tags/language_include.rb'
+
+# replace Jekyll::Reader upon page reset with Jekyll::LanguageReader extension
+Jekyll::Hooks.register :site, :after_reset do |site|
+  site.reader = Jekyll::LanguageReader.new(site)
+end

data/lib/jekyll/language_reader.rb

@@ -0,0 +1,12 @@
+module Jekyll
+  class LanguageReader < Reader
+    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
+    end
+
+    def retrieve_pages(dir, dot_pages)
+      site.pages.concat(LanguagePageReader.new(site, dir).read(dot_pages))
+    end
+  end
+end

data/lib/jekyll/readers/language_page_reader.rb

@@ -0,0 +1,32 @@
+module Jekyll
+  class LanguagePageReader < PageReader
+    alias_method :read_orig, :read
+
+    def read(files)
+      read_orig(files).flat_map do |page|
+        lpages = []
+        lpage = LanguagePage.new(@site, @site.source, page.dir, page.name)
+        if lpage.languages
+          for language in lpage.languages do
+            if lpage.language == language
+              lpages << lpage
+            elsif lpage.language.nil?
+              lpage.data['language'] = language
+              lpages << lpage
+            else
+              lpage2 = LanguagePage.new(@site, @site.source, page.dir, page.name)
+              lpage2.data['language'] = language
+              lpages << lpage2
+            end
+          end
+        elsif lpage.language
+          lpages << lpage
+        else
+          # no languages -> do not add extended Page
+          lpages << page
+        end
+        lpages
+      end
+    end
+  end
+end

data/lib/jekyll/readers/language_post_reader.rb

@@ -0,0 +1,27 @@
+module Jekyll
+  class LanguagePostReader < PostReader
+    alias_method :read_content_orig, :read_content
+
+    def read_content(dir, magic_dir, matcher)
+      read_content_orig(dir, magic_dir, matcher).flat_map do |document|
+        ldocument = LanguageDocument.new(document.path, { site: @site, collection: @site.posts })
+        ldocument.read
+
+        languages = ldocument.languages.is_a?(Enumerable) ? ldocument.languages : []
+        if ldocument.language and not languages.include?(ldocument.language)
+          languages.push(ldocument.language)
+        end
+
+        if languages.size == 0
+          return [document]
+        end
+
+        languages.map do |language|
+          ldocument2 = LanguageDocument.new(document.path, { site: @site, collection: @site.posts })
+          ldocument2.data['language'] = language
+          ldocument2
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-language-plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Vincent Wochnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -74,12 +74,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-language-plugin.rb
-- lib/jekyll-language-plugin/language_document.rb
-- lib/jekyll-language-plugin/language_page.rb
-- lib/jekyll-language-plugin/readers/page_reader.rb
-- lib/jekyll-language-plugin/readers/post_reader.rb
-- lib/jekyll-language-plugin/tags/language.rb
-- lib/jekyll-language-plugin/tags/language_include.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
 - README.md
 - LICENSE.md
 homepage: https://github.com/vwochnik/jekyll-language-plugin

data/lib/jekyll-language-plugin/readers/page_reader.rb

@@ -1,26 +0,0 @@
-module Jekyll
-  class PageReader
-    def read(files)
-      for file in files do
-        page = LanguagePage.new(@site, @site.source, @dir, file)
-        if page.languages
-          for language in page.languages do
-            if page.language == language
-              @unfiltered_content << page
-            elsif page.language.nil?
-              page.data['language'] = language
-              @unfiltered_content << page
-            else
-              page2 = LanguagePage.new(@site, @site.source, @dir, file)
-              page2.data['language'] = language
-              @unfiltered_content << page2
-            end
-          end
-        else
-          @unfiltered_content << page
-        end
-      end
-      @unfiltered_content.select{ |page| site.publisher.publish?(page) }
-    end
-  end
-end

data/lib/jekyll-language-plugin/readers/post_reader.rb

@@ -1,41 +0,0 @@
-module Jekyll
-  class PostReader
-    def read_content(dir, magic_dir, matcher)
-      entries = @site.reader.get_entries(dir, magic_dir)
-      documents = []
-      for entry in entries
-        next unless entry =~ matcher
-        path = @site.in_source_dir(File.join(dir, magic_dir, entry))
-        documents.concat(multilinguify(path))
-      end
-      documents
-    end
-
-    def multilinguify(path)
-      document = create_document_from_path(path)
-      document.read
-      if not document.language and not document.languages
-        # create a new document that can be freshly read
-        return [create_document_from_path(path)]
-      end
-
-      languages = document.languages || []
-      if document.language and not languages.include?(document.language)
-        languages.push(document.language)
-      end
-
-      languages.map do |language|
-        document2 = create_document_from_path(path)
-        document2.data['language'] = language
-        document2
-      end
-    end
-
-    def create_document_from_path(path)
-      LanguageDocument.new(path, {
-        site: @site,
-        collection: @site.posts
-      })
-    end
-  end
-end