jekyll-locale 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e9bb6b38af90f2abe329414e61479a0afb06bb
-  data.tar.gz: 531866e46d63671cafc32c233f64ec263bfb3744
+  metadata.gz: d7711d55551114d2ff94841695d72b0db57e5101
+  data.tar.gz: afa5ee87a7bb1a70fa8af07eb4d258b0f53a6cc3
 SHA512:
-  metadata.gz: c817b57303dd42dca2f76aa8f7bc7e5349c63879afbb2382268ecc91da1fe199f0135fd0d468d2d35a769a29a7dd6c8bb2eb77eb8383a5fd4b1467fac670f789
-  data.tar.gz: bb6c4a7712ce0d12e130231179b49a813f4e7fdd37ceff9d298f6d5799330b9f35549c0cd2c856562148b19a2a32f0f50fe665c775cd06b90786f4e0cbeef60e
+  metadata.gz: cdd9f7566119e15ed95fa2c92aef41bda3e474a45585b0872c1e9584d30fbc40f6dfe61ff5406c8caebdb6034386da2c6b6f806944cb713a8b7eeb72c4056d91
+  data.tar.gz: 719fb8949ff087f5684de77b5c6aaf9f2ed25200a8d8b95c4e6ed2c073a85b428102ed4c9285c1332282cb51bc184f9fcf0b8cc0617c742084f23593e3e18ab6

data/lib/jekyll/locale/handler.rb

@@ -21,6 +21,7 @@ module Jekyll
                 else
                   DEFAULT_CONFIG
                 end
+      @sanitized_locale = {}
     end
 
     def reset
@@ -29,7 +30,8 @@ module Jekyll
     end
 
     def data
-      locale_data[current_locale] || locale_data[default_locale] || {}
+      locale_data[sanitized_locale(current_locale)] ||
+        locale_data[sanitized_locale(default_locale)] || {}
     end
 
     def portfolio
@@ -39,6 +41,9 @@ module Jekyll
     def filtered_portfolio
       @filtered_portfolio ||= begin
         portfolio.reject do |item|
+          # consider only instances of class that include `Jekyll::Locale::Support` mixin
+          next true unless item.is_a?(Jekyll::Locale::Support)
+
           item.relative_path =~ exclusion_regex
         end
       end
@@ -47,6 +52,9 @@ module Jekyll
     def read
       available_locales.each do |locale|
         portfolio.each do |canon_doc|
+          # consider only instances of class that include `Jekyll::Locale::Support` mixin
+          next unless canon_doc.is_a?(Jekyll::Locale::Support)
+
           loc_page_path = site.in_source_dir(content_dirname, locale, canon_doc.relative_path)
           next unless File.exist?(loc_page_path)
           next unless Jekyll::Utils.has_yaml_header?(loc_page_path)
@@ -83,6 +91,10 @@ module Jekyll
       @default_locale ||= fetch("locale")
     end
 
+    def sanitized_locale(locale_key)
+      @sanitized_locale[locale_key] ||= locale_key.downcase.tr("-", "_")
+    end
+
     def content_dirname
       @content_dirname ||= fetch("content_dir")
     end
@@ -115,11 +127,23 @@ module Jekyll
 
     def locale_data
       @locale_data ||= begin
-        ldata = site.site_data[locales_dir]
-        return {} unless ldata.is_a?(Hash)
+        ldata  = site.site_data[locales_dir]
+        result = {}
+        return result unless ldata.is_a?(Hash)
+
+        ldata.each do |loc, loc_data|
+          locale = Utils.snakeify(loc)
+          result[locale] = {}
+          next unless loc_data.is_a?(Hash)
+
+          loc_data.each do |key, value|
+            next if key == "locale_date"
+
+            result[locale][Utils.snakeify(key)] = value.to_s
+          end
+        end
 
-        # transform hash to one with "latinized lowercased string keys"
-        Jekyll::Utils.snake_case_keys(ldata)
+        result
       end
     end
 

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

@@ -2,7 +2,7 @@
 
 module Jekyll
   module Locale::Support
-    attr_reader :locale
+    attr_reader :site, :locale
 
     def setup_hreflangs?
       false

data/lib/jekyll/locale/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Locale
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/jekyll/patches/utils.rb

@@ -15,13 +15,17 @@ module Jekyll
     def snake_case_keys(hash)
       transform_keys(hash) do |key|
         begin
-          Utils.slugify(key.to_s, :mode => "latin", :replacement => "_")
+          snakeify(key)
         rescue StandardError
           key.to_s
         end
       end
     end
 
+    def snakeify(input)
+      slugify(input.to_s, :mode => "latin", :replacement => "_")
+    end
+
     def slugify(string, mode: nil, cased: false, replacement: "-")
       mode ||= "default"
       return nil if string.nil?

metadata

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