jekyll-rendering 0.0.4 → 0.0.5

data/ChangeLog

@@ -1,5 +1,11 @@
 = Revision history for jekyll-rendering
 
+== 0.0.5 [2010-10-29]
+
+* Refactored include_file.
+  * Accept hash of local assigns instead of binding.
+  * Denote inclusion from current directory by './'.
+
 == 0.0.4 [2010-10-01]
 
 * Allow inclusion of files from *current* directory.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to jekyll-rendering version 0.0.4
+This documentation refers to jekyll-rendering version 0.0.5
 
 
 == DESCRIPTION

data/lib/jekyll/rendering.rb

@@ -141,36 +141,39 @@ module Jekyll
       # call-seq:
       #   engine.render => aString
       #   engine.render(content) => aString
-      #   engine.render(content, binding) => aString
+      #   engine.render(content, local_assigns) => aString
       #
-      # Renders the +content+ as ERB template. Uses optional +binding+
-      # if provided.
-      def render(content = content, binding = binding)
-        ::ERB.new(content).result(binding)
+      # Renders the +content+ as ERB template. Assigns optional
+      # +local_assigns+ for use in template if provided.
+      def render(content = content, local_assigns = {})
+        assigns = '<% ' << local_assigns.keys.map { |var|
+          "#{var} = local_assigns[#{var.inspect}]"
+        }.join("\n") << " %>\n" unless local_assigns.empty?
+
+        ::ERB.new("#{assigns}#{content}").result(binding)
       end
 
       module Helpers
 
         # call-seq:
         #   include_file file => aString
+        #   include_file file, local_assigns => aString
         #
         # Includes file +file+ from <tt>_includes</tt> directory, or current
-        # directory if +current+ is true, rendered as ERB template. Uses
-        # optional +binding+ if provided.
-        def include_file(file, current = false, binding = binding)
-          dir = current ? File.dirname(page.url) : '_includes'
-
-          Dir.chdir(File.join(site.source, dir)) {
-            @choices ||= Hash.new { |h, k|
-              h[k] = Dir['**/*'].reject { |x| File.symlink?(x) }
-            }
-
-            if @choices[dir].include?(file = file.strip)
-              render(File.read(file), binding)
-            else
-              "[Included file `#{file}' not found in `#{dir}'.]"
-            end
+        # directory if +file+ starts with <tt>./</tt>, rendered as ERB template.
+        # Passes optional +local_assigns+ on to #render.
+        def include_file(file, local_assigns = {})
+          @templates ||= Hash.new { |h, k|
+            h[k] = File.readable?(k) && File.read(k)
           }
+
+          dir = file =~ /\A\.\// ? File.dirname(page.url) : '_includes'
+
+          if template = @templates[File.join(site.source, dir, file)]
+            render(template, local_assigns)
+          else
+            "[Included file `#{file}' not found in `#{dir}'.]"
+          end
         end
 
         # call-seq:

data/lib/jekyll/rendering/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll-rendering
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 +02:00
+date: 2010-10-29 00:00:00 +02:00
 default_executable: 
 dependencies: []