jekyll-locale 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6aa5bfa8934b5488a01509fcc5edc532e218b7a
-  data.tar.gz: 896e029d6388b5c7c71f7864f5dce874916dad10
+  metadata.gz: c01d9a2e46d7017a012e1a293e2daa48494e5973
+  data.tar.gz: 2bb31ee5a8890dcfce4888fa1edfebbd9b87dc03
 SHA512:
-  metadata.gz: bd03beca23149b7a9d5518c8213185faa8c6b89361133a24bf4add596211fd2628797096fb99b30a7b235679eaa61d5469c2f8ceef8be7ff459d1a6ddea248fd
-  data.tar.gz: 80ef5c1b31991f96a3a6b8d26130039badeb93390285e80efff436920af1b9da086c7b4da123cc6525c569d4ab811e1492351da3717f3a20156be7872230cb97
+  metadata.gz: 958a745c6fc83812795057b33302055f9416fef9a8e9fcfccf1c9596d83f57a4dd8430c7421ab711ee613a6f4c8cb6398eacdeaa56a7a86c3b8ae84ffa6c5248
+  data.tar.gz: 7d3b86d40f1a62ec7ea7920f8651dc3a50c67124c37a658aae97a70c5b0859cc30c9af1aa6323158a405963b0069042bfc8e329466d56ac0c086fd7c0f9048f7

data/README.md

@@ -241,6 +241,8 @@ Instead filter out the canonical url from the for-loop, and render the canonical
 
 ### `localize_date`
 
+> **Adapted from [`localize` filter](https://github.com/borisschapira/borisschapira.com/blob/e3db4209536ea624466aa516e7feba79410b6719/_plugins/i18n_date_filter.rb#L9-L24) by Boris Schapira**
+
 This plugin provides a `localize_date` filter to aid in localizing valid date strings. It takes an optional parameter to specify the format
 of the output string.
 
@@ -258,6 +260,7 @@ time:
   formats:                              # A set of predefined strftime formats
     default: "%B %d, %Y %l:%M:%S %p %z" # Used by default if no other `format` has been specified.
     # my_format:                        # A valid strftime format of your choice.
+                                        #   Usage: {{ your_date | localize_date: ":my_format" }}
 ```
 
 #### Requirements

data/lib/jekyll-locale.rb

@@ -42,5 +42,6 @@ Jekyll::Hooks.register [:pages, :documents], :pre_render do |document, payload|
   handler = document.site.locale_handler
   handler.current_locale = document.locale
   document.setup_hreflangs if document.setup_hreflangs?
+  payload["page"]["locale"]    = document.locale || handler.default_locale
   payload["page"]["hreflangs"] = document.hreflangs
 end

data/lib/jekyll/locale/document.rb

@@ -17,6 +17,16 @@ module Jekyll
       configure_data
     end
 
+    def cleaned_relative_path
+      @cleaned_relative_path ||= begin
+        rel_path = relative_path[0..-extname.length - 1]
+        rel_path.sub!(@locale_page_dir, "")
+        rel_path.sub!(collection.relative_directory, "")
+        rel_path.gsub!(%r!\.*\z!, "")
+        rel_path
+      end
+    end
+
     def url_template
       @url_template ||= File.join("", locale, super)
     end

data/lib/jekyll/locale/drop.rb

@@ -11,6 +11,7 @@ module Jekyll
   #
 
   class Locale::PageDrop < Locale::Drop
-    def_delegators :@obj, :locale, :url
+    def_delegator  :@obj, :relative_path, :path
+    def_delegators :@obj, :url
   end
 end

data/lib/jekyll/locale/generator.rb

@@ -12,7 +12,7 @@ module Jekyll
 
       handler.user_locales.each do |locale|
         handler.filtered_portfolio.each do |canon_doc|
-          handler.append_document(Locale::AutoPage, canon_doc, locale, site.pages)
+          handler.append_document(Locale::AutoPage, canon_doc, locale)
         end
       end
     end

data/lib/jekyll/locale/handler.rb

@@ -26,9 +26,10 @@ module Jekyll
     end
 
     def reset
-      @portfolio    = nil
       @locale_data  = {}
       @locale_dates = {}
+      @portfolio = nil
+      @filtered_portfolio = nil
     end
 
     def data
@@ -63,18 +64,18 @@ module Jekyll
 
           case canon_doc
           when Jekyll::Page
-            append_document(Locale::Page, canon_doc, locale, site.pages)
+            append_document(Locale::Page, canon_doc, locale)
           when Jekyll::Document
-            append_document(Locale::Document, canon_doc, locale, site.docs_to_write)
+            append_document(Locale::Document, canon_doc, locale)
           end
         end
       end
     end
 
-    def append_document(klass, canon_doc, locale, base_array)
+    def append_document(klass, canon_doc, locale)
       locale_page = klass.new(canon_doc, locale)
       canon_doc.locale_pages << locale_page
-      base_array << locale_page
+      site.pages << locale_page
     end
 
     def user_locales
@@ -128,10 +129,8 @@ module Jekyll
     attr_reader :site, :config, :locale_data
 
     def html_pages
-      @html_pages ||= begin
-        pages = site.site_payload["site"]["html_pages"] || []
-        pages.reject { |page| page.name == "404.html" }
-      end
+      pages = site.site_payload["site"]["html_pages"] || []
+      pages.reject { |page| page.name == "404.html" }
     end
 
     def locales_dir

data/lib/jekyll/locale/mixins/helper.rb

@@ -31,16 +31,18 @@ module Jekyll
     private
 
     def setup(canon, locale)
-      @locale = locale
-      @canon = canon
-      @site = canon.site
+      @locale  = locale
+      @canon   = canon
+      @site    = canon.site
       @extname = canon.extname
-      @relative_path = canon.relative_path
-      @path = site.in_source_dir(site.locale_handler.content_dirname, locale, relative_path)
+      @locale_page_dir = File.join(@site.locale_handler.content_dirname, locale, "")
+      @relative_path   = File.join(@locale_page_dir, canon.relative_path)
+      @path = @site.in_source_dir(@relative_path)
     end
 
     def configure_data
       Jekyll::Utils.deep_merge_hashes(canon.data, @data)
+      @data["categories"] = canon.data["categories"]
     end
   end
 end

data/lib/jekyll/locale/page.rb

@@ -3,15 +3,22 @@
 module Jekyll
   class Locale::Page < Page
     include Locale::Helper
+    attr_reader :path
 
     def initialize(canon, locale)
       setup(canon, locale)
       @dir, @name = File.split(relative_path)
-      @dir  = "" if @dir == "."
       @base = site.source
       process(@name)
       read_yaml(@dir, @name)
       configure_data
+
+      # Empty the value as it is not longer required.
+      @dir = ""
+    end
+
+    def to_liquid
+      @to_liquid ||= Locale::PageDrop.new(self)
     end
 
     def template

data/lib/jekyll/locale/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Locale
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-locale
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ashwin Maroli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll