jekyll-language-plugin 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f68ac9191d9f6cb48cf3543c56a77b7e4feab60
-  data.tar.gz: 361f0c76aaba69215a66c1aed0137cee6224e25c
+  metadata.gz: 1654e2f4bf11914d49db7c2d585ad30e82087f55
+  data.tar.gz: 6043c92dbc51bf59825cd72e24a0e422fc7c3ef6
 SHA512:
-  metadata.gz: 4221a4fda1d0042a4af2ac0a7be3a78214e0ee80571470425dc9813fd4f33e3a66d5c0026d17a3c3ca38793421b00413bd17ab5f79e5c81da51b2ced57144728
-  data.tar.gz: 8337952640d00526dd6f98421a05943f1676586535145ba9667bccf384c90296fd634e37fca823ecf4a25f80d4aa65df36966eba4d5bd31565aabb6da051a080
+  metadata.gz: a0389df0dc98678798a902e8dbc560666cf3fc2767ca5be77234018d038d0995932a74e1a821d8c550f1353c9115d0164b55cb45be6c1368ca8595b772b515f3
+  data.tar.gz: b1137b4c476b9ffd3be89dfbd6499464c4d632bafcd19521639d8491d153390f30dceb4b47de8aaf2656a6444361d89ac1e28b202bddd2f217c442618f7a4496

data/lib/jekyll-language-plugin.rb

@@ -2,6 +2,7 @@ module Jekyll
 
   # 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'
@@ -15,9 +16,27 @@ module Jekyll
     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 loaders
+        @loaders ||= []
+      end
+
+      def register_loader(loader)
+        loaders.push(loader)
+      end
+    end
   end
 end
 
+# require data built-in loaders
+require 'jekyll/language-plugin/loaders/jekyll_data_loader.rb'
+require 'jekyll/language-plugin/loaders/rails_i18n_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'

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

@@ -5,11 +5,13 @@ module Jekyll
         language_data = Jekyll::LanguagePlugin::LiquidContext.get_language_data(context)
         translation = language_data.get('date')
 
+        raise Jekyll::LanguagePlugin::PluginError.new('No localized date available.') if translation.nil?
+
         # validate language translation
         if !['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
-          raise Jekyll::LanguagePlugin::PluginError.new('Localized date is missing translation.')
+          raise Jekyll::LanguagePlugin::PluginError.new('Invalid localized date translation.')
         end
 
         date.strftime(

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

@@ -1,57 +1,23 @@
 module Jekyll
   module LanguagePlugin
     class LanguageData
-      attr_reader :site, :Language
+      attr_reader :language
 
       def initialize(site, language)
-        @site = site
         @language = language
+        @loaders = Jekyll::LanguagePlugin.loaders.map{ |l| l.new(site) }
       end
 
-      def get(keys)
-        obj = retrieve_obj(keys)
-        raise Jekyll::LanguagePlugin::PluginError.new("Invalid language data configuration. #{keys.join('.')} not found.") if language_data.nil?
-        obj
-      end
-
-      def has?(keys)
-        !retrieve_obj(keys).nil?
-      end
-
-      def retrieve_obj(keys)
-        return nil if @language.to_s.empty?
-        keys = resolve_dot_notation([language_data, keys])
-
-        obj = site.send(keys.shift)
-        traverse_hash(obj, keys)
-      end
-
-      def language_data()
-        @language_data ||= site.config['language_data'].to_s || 'data.lang.%%'
-        @language_data.gsub("%%", @language)
-      end
-
-      def traverse_hash(hash, keys)
-        return nil if hash.nil?
-
-        for key in keys
-          if !hash.is_a?(Hash)
-            return hash
-          elsif !hash.key?(key)
-            return nil
-          end
-          hash = hash[key]
+      def get(key)
+        @loaders.inject(nil) do |result, loader|
+          loader.load unless loader.loaded?
+          result = loader.get(key, @language)
+          break result unless result.nil?
         end
-        hash
       end
 
-      def resolve_dot_notation(keys)
-        return keys.split('.') if keys.is_a?(String)
-        return [] if !keys.is_a?(Enumerable)
-
-        keys.flat_map do |key|
-          resolve_dot_notation(key)
-        end
+      def has?(key)
+        !get(key).nil?
       end
     end
   end

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

@@ -18,15 +18,12 @@ module Jekyll
       def self.get_language_string(context, key)
         language_data = self.get_language_data(context)
 
-        if language_data.nil?
-          $stdout.puts("language data is nil")
-        end
         subset = context.registers[:page]['subset']
-        if !subset.to_s.empty? && language_data.has?([subset, key])
-          return language_data.get([subset, key])
-        end
+        str = language_data.get([subset, key]) unless subset.to_s.empty?
+        str ||= language_data.get(key)
 
-        language_data.get(key)
+        raise Jekyll::LanguagePlugin::PluginError.new('Key #{key} not found intranslation.') if str.nil?
+        str
       end
 
       def self.get_language_name(context, name)

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

@@ -0,0 +1,47 @@
+module Jekyll
+  module LanguagePlugin
+    module Loaders
+      class BaseLoader
+        attr_reader :site, :is_loaded
+
+        def initialize(site)
+          @site = site
+          @is_loaded = false
+        end
+
+        def loaded?
+          @is_loaded
+        end
+
+        def load
+          @is_loaded
+        end
+
+        def get(key, language)
+          nil
+        end
+
+        def traverse_hash(hash, keys)
+          for key in keys
+            if !hash.is_a?(Hash)
+              return hash
+            elsif !hash.key?(key)
+              return nil
+            end
+            hash = hash[key]
+          end
+          hash
+        end
+
+        def resolve_dot_notation(keys)
+          return keys.split('.') if keys.is_a?(String)
+          return [] if !keys.is_a?(Enumerable)
+
+          keys.flat_map do |key|
+            resolve_dot_notation(key)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Jekyll
+  module LanguagePlugin
+    module Loaders
+      class JekyllDataLoader < BaseLoader
+        def initialize(site)
+          super
+          @is_loaded = true
+        end
+        
+        def get(key, language)
+          key = resolve_dot_notation(key)
+
+          data = get_language_data(language)
+          traverse_hash(data, key)
+        end
+
+        def get_language_data(language)
+          @language_data ||= site.config['language_data'].to_s || 'data.lang.%%'
+          language_data_l = @language_data.gsub("%%", language)
+
+          key = resolve_dot_notation(language_data_l)
+
+          obj = site.send(key.shift)
+          obj = traverse_hash(obj, key)
+          raise Jekyll::LanguagePlugin::PluginError.new("Invalid language data configuration. Cannot retrieve data for language #{language} at #{language_data_l}") if obj.nil?
+          obj
+        end
+      end
+    end
+  end
+end
+
+Jekyll::LanguagePlugin.register_loader(Jekyll::LanguagePlugin::Loaders::JekyllDataLoader)

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

@@ -0,0 +1,51 @@
+require 'rubygems'
+require 'yaml'
+
+module Jekyll
+  module LanguagePlugin
+    module Loaders
+      class RailsI18nLoader < BaseLoader
+        @@data = nil
+
+        def load
+          if !@is_loaded
+            self.class.load_data if @@data.nil?
+            @is_loaded = true
+          end
+        end
+
+        def get(key, language)
+          return nil unless loaded?
+          traverse_hash(@@data, [language, key])
+        end
+
+        def self.load_data
+          gem_root = Gem.loaded_specs['rails-i18n'].full_gem_path
+          files = Dir[File.join(gem_root, 'rails', '**', '*.yml')]
+          @@data = files.inject(Hash.new) do |data, file|
+            key = File.basename(file, '.yml')
+            source = YAML.load_file(file)
+            break data if !source.has_key?(key) || source[key]['date'].nil?
+
+            # extract date object
+            date = source[key]['date']
+            date.delete_if { |k, _| k !~ /\A(?:abbr_day_names|abbr_month_names|day_names|month_names)\z/ }
+            date = Hash[date.map { |k, v| [k.sub(/_names\Z/, 'names'), v] }]
+            date['abbr_monthnames'].shift
+            date['monthnames'].shift
+
+            data.merge!({
+              key => { 'date' => date }
+            })
+          end
+        end
+      end
+    end
+  end
+end
+
+begin
+  require 'rails-i18n'
+  Jekyll::LanguagePlugin.register_loader(Jekyll::LanguagePlugin::Loaders::RailsI18nLoader)
+rescue LoadError
+end

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

@@ -1,5 +1,5 @@
 module Jekyll
   module LanguagePlugin
-    VERSION = '1.1.8'
+    VERSION = '1.2.0'
   end
 end

data/lib/jekyll/language_document.rb

@@ -1,23 +1,10 @@
 module Jekyll
   class LanguageDocument < Document
+    include LanguageProperties
+
     alias_method :url_template_orig, :url_template
     alias_method :url_placeholders_orig, :url_placeholders
 
-    def language
-      return nil if data.nil? || data['language'].nil?
-      data['language']
-    end
-
-    def languages
-      return nil if data.nil? || data['languages'].nil?
-      data['languages']
-    end
-
-    def subset
-      return nil if data.nil? || data['subset'].nil?
-      data['subset']
-    end
-
     def url_template
       return "/:language" + url_template_orig if !language.nil?
       url_template_orig

data/lib/jekyll/language_page.rb

@@ -1,23 +1,10 @@
 module Jekyll
   class LanguagePage < Page
+    include LanguageProperties
+
     alias_method :template_orig, :template
     alias_method :url_placeholders_orig, :url_placeholders
 
-    def language
-      return nil if data.nil? || data['language'].nil?
-      data['language']
-    end
-
-    def languages
-      return nil if data.nil? || data['languages'].nil?
-      data['languages']
-    end
-
-    def subset
-      return nil if data.nil? || data['subset'].nil?
-      data['subset']
-    end
-
     def template
       return "/:language" + template_orig if !language.nil?
       template_orig
@@ -32,8 +19,12 @@ module Jekyll
       if !language.nil? && !subset.nil?
         @language_data ||= LanguagePlugin::LanguageData.new(@site, language)
 
-        data = @language_data.get(subset).reject{ |k, v| v.is_a?(Enumerable) }
-        result.merge!(Hash[data.map{ |k, v| ["t.#{k}", v] }])
+        data = @language_data.get(subset)
+
+        if !data.nil?
+          filtered = data.reject{ |k, v| v.is_a?(Enumerable) }
+          result.merge!(Hash[filtered.map{ |k, v| ["t.#{k}", v] }])
+        end
       end
 
       result

data/lib/jekyll/language_properties.rb

@@ -0,0 +1,18 @@
+module Jekyll
+  module LanguageProperties
+    def language
+      return nil if data.nil? || data['language'].nil?
+      data['language']
+    end
+
+    def languages
+      return nil if data.nil? || data['languages'].nil?
+      data['languages']
+    end
+
+    def subset
+      return nil if data.nil? || data['subset'].nil?
+      data['subset']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-language-plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Vincent Wochnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -78,6 +78,9 @@ files:
 - lib/jekyll/language-plugin/filters/language_date.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/jekyll_data_loader.rb
+- lib/jekyll/language-plugin/loaders/rails_i18n_loader.rb
 - lib/jekyll/language-plugin/plugin_error.rb
 - lib/jekyll/language-plugin/tags/language.rb
 - lib/jekyll/language-plugin/tags/language_include.rb
@@ -85,6 +88,7 @@ files:
 - lib/jekyll/language-plugin/version.rb
 - lib/jekyll/language_document.rb
 - lib/jekyll/language_page.rb
+- lib/jekyll/language_properties.rb
 - lib/jekyll/language_reader.rb
 - lib/jekyll/readers/language_page_reader.rb
 - lib/jekyll/readers/language_post_reader.rb