rack-esi 0.1.1 → 0.1.2

data/README.markdown

@@ -11,7 +11,7 @@ for include, remove and comment.
  * include limits (:includes => 32)
  * support for <include> alt and noerror attributes
 
-_It's for development purpose since its still 0.1.x..._
+_It's for development purpose..._
 
 ## Installation
 
@@ -20,7 +20,8 @@ _It's for development purpose since its still 0.1.x..._
 ## Rails Setup (environment.rb)
 
     config.gem 'rack-esi'
-    config.middleware.use(Rack::ESI, opts = {})
+    require 'rack-esi'
+    config.middleware.insert_before config.middleware.first, Rack::ESI
 
 ## TODO
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rack-esi.rb

@@ -3,7 +3,17 @@ require 'nokogiri'
 
 class Rack::ESI
   NS = { 'esi' => 'http://www.edge-delivery.org/esi/1.0' }
-  Error = Class.new RuntimeError
+  METHODS = { 'include' => :esi_include, 'remove' => nil, 'comment' => nil }
+  CSS = METHODS.keys.map { |cmd| "esi|#{ cmd }" } * ','
+
+  class Error < RuntimeError
+    def initialize(status, headers, response)
+      @status, @headers, @response = status, headers, response
+    end
+    def finish
+      return [@status, @headers, backtrace]
+    end
+  end
 
   def initialize(app, options = {})
     @app  = app
@@ -17,49 +27,35 @@ class Rack::ESI
   def call env, counter = { :recursion => 0, :includes => 0 }
     return @app.call(env) if skip_path? env['PATH_INFO']
 
-    status, headers, source = @app.call env
-    return status, headers, source if skip_type? headers['Content-Type']
+    status, headers, input = @app.call env.dup
+    return status, headers, input if skip_type? headers['Content-Type']
 
-    Rack::Response.new { |target|
-      source.each { |body| target.write compile(body, env, counter) }
-    }.finish
+    output = []
+    input.each { |body| output << compile_body(body, env, counter) }
+
+    Rack::Response.new(output, status, headers).finish
   end
 
   private
 
+    def with_compiled_path(env, path)
+      # TODO: should compile variables.
+      env.merge 'PATH_INFO' => path, 'REQUEST_URI' => path
+    end
+
     def fetch(path, env, counter)
-      call env.merge('PATH_INFO' => path), counter if path
+      call with_compiled_path(env, path), counter if path
+    rescue => e
+      return [500, {}, e.backtrace]
     end
 
     # Should I use XML::SAX::Parser?
-    def compile(body, env, counter)
+    def compile_body(body, env, counter)
       document = Nokogiri.XML body
 
-      document.css('esi|include,esi|remove,esi|comment', NS).each do |node|
-        case node.name
-        when 'include'
-          next unless counter[:includes] < @max_includes
-          counter[:includes] += 1
-          begin
-            next unless counter[:recursion] < @max_recursion
-            counter[:recursion] += 1
-            status, headers, compiled = fetch node['src'], env, counter
-            status, headers, compiled = fetch node['alt'], env, counter if status != 200
-          ensure
-            counter[:recursion] -= 1
-          end
-
-          if status != 200
-            raise Error if node['onerror'] != 'continue'
-            compiled = []
-          end
-
-          data = '' and compiled.each { |body| data << body }
-          node.swap data
-
-        when 'remove', 'comment'
-          node.unlink
-        end
+      document.css(CSS, NS).each do |node|
+        method = METHODS[node.name] and send method, node, env, counter
+        node.unlink
       end
 
       document.to_xhtml
@@ -72,4 +68,30 @@ class Rack::ESI
       @types !~ type
     end
 
+    def max?(counter)
+      not counter[:includes] < @max_includes &&
+          counter[:recursion] < @max_recursion
+    end
+
+    def esi_include(node, env, counter)
+      return if max? counter
+
+      counter[:includes] += 1
+      counter[:recursion] += 1
+
+      status, headers, response = fetch node['src'], env, counter
+      status, headers, response = fetch node['alt'], env, counter if status != 200
+
+      if status == 200
+        data = ''
+        response.each { |inc| data << inc }
+        node.before data
+      elsif node['onerror'] != 'continue'
+        raise Error.new(status, headers, response)
+      end
+
+    ensure
+      counter[:recursion] -= 1
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-esi
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Florian A\xC3\x9Fmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +01:00
+date: 2009-11-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency