jekyll-rendering 0.0.5 → 0.0.6

data/ChangeLog

@@ -1,5 +1,10 @@
 = Revision history for jekyll-rendering
 
+== 0.0.6 [2011-03-09]
+
+* Defined Jekyll::Rendering::ERB_OPTIONS to allow
+  adjusting behaviour of ERB.new.
+
 == 0.0.5 [2010-10-29]
 
 * Refactored include_file.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to jekyll-rendering version 0.0.5
+This documentation refers to jekyll-rendering version 0.0.6
 
 
 == DESCRIPTION
@@ -15,6 +15,9 @@ Add the following to your <tt>_plugins/ext.rb</tt> file:
 
 Then set +engine+ in your <tt>_config.yml</tt>. The default engine is +liquid+.
 
+Options passed to ERB.new are taken from <tt>Jekyll::Rendering::ERB_OPTIONS</tt>.
+Modify this array if you want to change defaults.
+
 
 == TODO
 
@@ -42,7 +45,7 @@ RubyGem::       <http://rubygems.org/gems/jekyll-rendering>
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2010 University of Cologne,
+Copyright (C) 2010-2011 University of Cologne,
 Albertus-Magnus-Platz, 50923 Cologne, Germany
 
 jekyll-rendering is free software: you can redistribute it and/or modify it under

data/Rakefile

@@ -1,24 +1,21 @@
-require %q{lib/jekyll/rendering/version}
+require File.expand_path(%q{../lib/jekyll/rendering/version}, __FILE__)
 
 begin
   require 'hen'
 
   Hen.lay! {{
     :gem => {
-      :name         => %q{jekyll-rendering},
-      :version      => Jekyll::Rendering::VERSION,
-      :summary      => %q{Jekyll plugin to provide alternative rendering engines.},
-      :files        => FileList['lib/**/*.rb'].to_a,
-      :extra_files  => FileList['[A-Z]*'].to_a,
-      :dependencies => %w[]
+      :name    => %q{jekyll-rendering},
+      :version => Jekyll::Rendering::VERSION,
+      :summary => %q{Jekyll plugin to provide alternative rendering engines.},
+      :author  => %q{Jens Wille},
+      :email   => %q{jens.wille@uni-koeln.de}
     }
   }}
-rescue LoadError
-  warn "Please install the `hen' gem."
+rescue LoadError => err
+  warn "Please install the `hen' gem. (#{err})"
 end
 
-### Place your custom Rake tasks here.
-
 begin
   require 'jekyll/testtasks/rake'
 rescue LoadError

data/lib/jekyll/rendering.rb

@@ -3,9 +3,9 @@
 #                                                                             #
 # jekyll-rendering -- Jekyll plugin to provide alternative rendering engines  #
 #                                                                             #
-# Copyright (C) 2010 University of Cologne,                                   #
-#                    Albertus-Magnus-Platz,                                   #
-#                    50923 Cologne, Germany                                   #
+# Copyright (C) 2010-2011 University of Cologne,                              #
+#                         Albertus-Magnus-Platz,                              #
+#                         50923 Cologne, Germany                              #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -32,6 +32,10 @@ require 'ostruct'
 module Jekyll
 
   module Rendering
+
+    # Options passed to ERB.new: +safe_level+, +trim_mode+, +eoutvar+.
+    ERB_OPTIONS = [nil, nil, '_erbout' ]
+
   end
 
   module Convertible
@@ -46,7 +50,7 @@ module Jekyll
       payload['pygments_suffix'] = converter.pygments_suffix
 
       # render and transform content (this becomes the final content of the object)
-      self.content = engine.render(payload, content, info)
+      self.content = engine.render(payload, content, info, data)
       transform
 
       # output keeps track of what will finally be written
@@ -57,7 +61,7 @@ module Jekyll
 
       while layout = layouts[layout.data['layout']]
         payload = payload.deep_merge('content' => output, 'page' => layout.data)
-        self.output = engine.render(payload, output, info, layout.content)
+        self.output = engine.render(payload, output, info, data, layout.content)
       end
     end
 
@@ -88,15 +92,15 @@ module Jekyll
       #   Engine::Base.render(*args)
       #
       # Renders the output. Defers to engine's render method.
-      def self.render(payload, content, info, layout = nil)
-        new(payload, content, info).render(layout || content)
+      def self.render(payload, content, info, data = {}, layout = nil)
+        new(payload, content, info, data).render(layout || content)
       end
 
-      attr_reader   :payload, :info
+      attr_reader   :payload, :info, :data
       attr_accessor :content
 
-      def initialize(payload, content = nil, info = {})
-        @payload, @content, @info = payload, content, info
+      def initialize(payload, content = nil, info = {}, data = {})
+        @payload, @content, @info, @data = payload, content, info, data
       end
 
       # call-seq:
@@ -107,6 +111,11 @@ module Jekyll
         raise NotImplementedError
       end
 
+      def render_error(err)
+        name = self.class.name.split('::').last
+        warn "#{name} Exception: #{err} (in #{data['layout'] || '(top)'})"
+      end
+
     end
 
     class Liquid < Base
@@ -119,6 +128,8 @@ module Jekyll
       # calling ::Liquid::Template#render with +payload+ and +info+.
       def render(content = content)
         ::Liquid::Template.parse(content).render(payload, info)
+      rescue => err
+        render_error(err)
       end
 
     end
@@ -150,7 +161,9 @@ module Jekyll
           "#{var} = local_assigns[#{var.inspect}]"
         }.join("\n") << " %>\n" unless local_assigns.empty?
 
-        ::ERB.new("#{assigns}#{content}").result(binding)
+        ERB.new("#{assigns}#{content}", *Rendering::ERB_OPTIONS).result(binding)
+      rescue => err
+        render_error(err)
       end
 
       module Helpers

data/lib/jekyll/rendering/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll-rendering
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2011-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -26,9 +26,9 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- README
 - COPYING
 - ChangeLog
-- README
 files: 
 - lib/jekyll/rendering.rb
 - lib/jekyll/rendering/version.rb
@@ -42,15 +42,14 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --title
-- jekyll-rendering Application documentation
 - --main
 - README
-- --line-numbers
-- --inline-source
 - --all
 - --charset
 - UTF-8
+- --title
+- jekyll-rendering Application documentation (v0.0.6)
+- --line-numbers
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -74,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Jekyll plugin to provide alternative rendering engines.