jekyll-localization 0.0.2 → 0.0.3

data/ChangeLog

@@ -1,5 +1,9 @@
 = Revision history for jekyll-localization
 
+== 0.0.3 [2010-09-16]
+
+* Use alternate page contenten if a page is empty in one language
+
 == 0.0.2 [2010-07-01]
 
 * Refactoring and documentation.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to jekyll-localization version 0.0.2
+This documentation refers to jekyll-localization version 0.0.3
 
 
 == DESCRIPTION

data/Rakefile

@@ -10,11 +10,19 @@ begin
       :summary      => %q{Jekyll plugin that adds localization features to the rendering engine.},
       :files        => FileList['lib/**/*.rb'].to_a,
       :extra_files  => FileList['[A-Z]*'].to_a,
-      :dependencies => %w[jekyll-rendering]
+      :dependencies => %w[jekyll-rendering],
+      :authors      => ["Jens Wille"],
+      :email        => %q{jens.wille@uni-koeln.de}
     }
   }}
 rescue LoadError
-  abort "Please install the 'hen' gem first."
+  warn "Please install the `hen' gem."
 end
 
 ### Place your custom Rake tasks here.
+
+begin
+  require 'jekyll/testtasks/rake'
+rescue LoadError
+  warn "Please install the `jekyll-testtasks' gem."
+end

data/lib/jekyll/localization.rb

@@ -40,20 +40,85 @@ module Jekyll
     # What is considered a language extension
     LANG_EXT_RE = %r{\.([a-z]{2})}
 
-  end
+    # Extract relevant parts from a file name
+    LANG_PARTS_RE = %r{\A(.*?)#{LANG_EXT_RE}\.(\w+)\z}
 
-  class Page
+    module LocalizedConvertible
+
+      def self.included(base)
+        base.class_eval {
+          alias_method :initialize_without_localization, :initialize
+          alias_method :initialize, :initialize_with_localization
+        }
+      end
 
-    alias_method :_localization_original_initialize, :initialize
+      private
 
-    # Overwrites the original method to extract the language extension.
-    def initialize(site, base, dir, name)
-      _localization_original_initialize(site, base, dir, name)
+      # Enhances the original method to extract the language extension.
+      def initialize_with_localization(*args)
+        initialize_without_localization(*args)
 
-      @lang = data['lang'] = @name[/#{Localization::LANG_EXT_RE}\.\w+\z/, 1]
-      @lang_ext = ".#{@lang}" if @lang
+        if @lang = extract_lang(@name)
+          data['lang'] = @lang
+          @lang_ext = ".#{@lang}"
+        end
+      end
+
+      # call-seq:
+      #
+      #
+      # Extracts language extension from +name+, or all relevant parts
+      # if +all+ is true.
+      def extract_lang(name, all = false)
+        if md = name.match(LANG_PARTS_RE)
+          all ? md.captures : md[2]
+        else
+          all ? [] : nil
+        end
+      end
+
+      def read_alternate_language_content(base, name)
+        basename, lang, ext = extract_lang(name, true)
+        return unless lang
+
+        data = self.data  # keep original YAML data!
+
+        (LANGUAGES - [lang]).each { |alternate_lang|
+          alternate_name = [basename, alternate_lang, ext].join('.')
+
+          if File.exists?(File.join(base, alternate_name))
+            read_yaml(base, alternate_name, false)
+            break unless content.empty?
+          end
+        }
+
+        self.data = data
+      end
+
+    end
+
+    [Page, Post, Layout].each { |klass|
+      klass.send(:include, LocalizedConvertible)
+    }
+
+  end
+
+  module Convertible
+
+    alias_method :_localization_original_read_yaml, :read_yaml
+
+    # Overwrites the original method to optionally set the content of a
+    # file with no content in it to the content of a file with another
+    # language which does have content in it.
+    def read_yaml(base, name, alt = true)
+      _localization_original_read_yaml(base, name)
+      read_alternate_language_content(base, name) if alt && content.empty?
     end
 
+  end
+
+  class Page
+
     alias_method :_localization_original_url, :url
 
     # Overwrites the original method to include the language extension.

data/lib/jekyll/localization/version.rb

@@ -6,7 +6,7 @@ module Jekyll
 
       MAJOR = 0
       MINOR = 0
-      TINY  = 2
+      TINY  = 3
 
       class << self
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll-localization
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 +02:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll-rendering
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -43,12 +40,12 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
-- lib/jekyll/localization.rb
 - lib/jekyll/localization/version.rb
-- README
-- ChangeLog
+- lib/jekyll/localization.rb
 - Rakefile
 - COPYING
+- ChangeLog
+- README
 has_rdoc: true
 homepage: 
 licenses: []
@@ -67,27 +64,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Jekyll plugin that adds localization features to the rendering engine.