joshbuddy-esi-for-rack 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/esi_for_rack.rb

@@ -14,18 +14,28 @@ class EsiForRack
     @lookup = lookup
   end
   
+  def self.response_body_to_str(response_body)
+    if response_body.respond_to? :to_str
+      response_body.to_str
+    elsif response_body.respond_to?(:each)
+      body = ''
+      response_body.each { |part|
+        body << part.to_s
+      }
+      body
+    else
+      raise TypeError, "stringable or iterable required"
+    end
+  end
+  
   def call(env)
-    @lookup ||= Lookup::PassThrough.new(@app, env)
-    
+    @lookup ||= [Lookup::PassThrough.new(@app, env), Lookup::Http.new(@app, env)]
     request = Rack::Request.new(env)
     result = @app.call(env)
     response = Rack::Response.new(result[2], result[0], result[1])
 
     if response['Content-Type'] =~ /text\/html/
-      body = ""
-      response.body.each do |part|
-        body << part
-      end
+      body = EsiForRack.response_body_to_str(result.last)
       
       user_agent_hash = {}
       begin
@@ -48,10 +58,8 @@ class EsiForRack
         # error parsing ua
       end
       
-      
-      
       binding = {
-        :HTTP_ACCEPT_LANGUAGE => Set.new((env['HTTP_ACCEPT_LANGUAGE'] || '').split(',').map{|l| l.strip.gsub(/q=[0-9]\.[0-9]{1,3}/, '').gsub(';','')}),
+        :HTTP_ACCEPT_LANGUAGE => Set.new((env['HTTP_ACCEPT_LANGUAGE'] || '').split(',').map{|l| l.gsub(/q=[0-9]\.[0-9]{1,3}/, '').gsub(';','').strip}),
         :HTTP_COOKIE => request.cookies,
         :HTTP_HOST => request.host,
         :HTTP_REFERER => request.referer,
@@ -59,25 +67,15 @@ class EsiForRack
         :QUERY_STRING => request.GET
       }
       context = Node::Context.new(binding, @lookup)
-      [response.status, response.headers, [context.parse(body).to_s]]
+      
+      parsed_body = context.parse(body).to_s
+      response.header['Content-Length'] = parsed_body.size.to_s
+      
+      [response.status, response.headers, [parsed_body]]
     else
       result
     end
     
   end
   
-  class IOWrapper
-    def initialize(body)
-      @body = body.each
-    end
-
-    def read
-      @body.end?
-    end
-    
-    def close
-      #no-op
-    end
-  end
-  
 end

data/lib/esi_for_rack/lookup.rb

@@ -1,8 +1,11 @@
+require 'net/http'
+require 'uri'
+
 class EsiForRack
 
   class Lookup
     
-    class PassThrough < Lookup
+    class Http
       
       def initialize(app, env)
         @app = app
@@ -10,6 +13,26 @@ class EsiForRack
       end
       
       def [](path)
+        return unless path[0,4] == 'http'
+        uri = URI(path)
+        res = Net::HTTP.start(uri.host, uri.port) {|http|
+          http.get(uri.request_uri)
+        }
+        res.body if res.code == '200'
+      end
+      
+    end
+    
+    class PassThrough
+      
+      def initialize(app, env)
+        @app = app
+        @env = env
+      end
+      
+      def [](path)
+        return if path[0,4] == 'http'
+        
         uri = URI(path)
         
         request = {
@@ -24,18 +47,7 @@ class EsiForRack
 
         response = @app.call(request)
         if response.first == 200
-          response_body = response.last
-          if response_body.respond_to? :to_str
-            response_body.to_str
-          elsif response_body.respond_to?(:each)
-            body = ''
-            response_body.each { |part|
-              body << part.to_s
-            }
-            body
-          else
-            raise TypeError, "stringable or iterable required"
-          end
+          EsiForRack.response_body_to_str(response.last)
         else
           nil
         end

data/lib/esi_for_rack/node.rb

@@ -19,21 +19,28 @@ class EsiForRack
 
     class Include < Node
       
-      def execute
-        @resolved_src = EsiAttributeLanguage::SimpleGrammar.parse(@node['src']).execute(context.resolver)
-        @resolved_alt = EsiAttributeLanguage::SimpleGrammar.parse(@node['alt']).execute(context.resolver) if @node['alt']
-        @continue_on_error = node['onerror'] == 'continue'
+      def resolved_src
+        EsiAttributeLanguage::SimpleGrammar.parse(@node['src']).execute(context.resolver)
+      end
+      
+      def resolved_alt
+        EsiAttributeLanguage::SimpleGrammar.parse(@node['alt']).execute(context.resolver) if @node['alt']
+      end
 
-        context.lookup[@resolved_src] ||
-        (@resolved_alt && context.lookup[@resolved_alt]) || 
-        (!@continue_on_error && raise(IncludeFailedError.new)) || nil
+      def continue_on_error?
+        node['onerror'] == 'continue'
+      end
+      
+      def execute
+        context.lookup(resolved_src) or
+        (resolved_alt && context.lookup(resolved_alt)) or
+        (!continue_on_error? && raise(IncludeFailedError.new)) or nil
       end
 
     end
     
     class Vars < Node
-      def execute                                    
-        #@content = node.inner_html
+      def execute
         @content = Rack::Utils.unescape(node.inner_html)
         EsiAttributeLanguage::SimpleGrammar.parse(@content).execute(context.resolver)
       end
@@ -84,12 +91,11 @@ class EsiForRack
     
     class Context
       
-      attr_reader :resolver, :lookup, :doc
+      attr_reader :resolver, :doc
       
       def initialize(resolver, lookup)
         @resolver = resolver
-        @lookup = lookup
-        
+        @lookup = lookup.is_a?(Array) ? lookup : [lookup]
         @include = Include.new
         @choose = Choose.new
         @vars = Vars.new
@@ -97,6 +103,14 @@ class EsiForRack
         
       end
     
+      def lookup(url)
+        @lookup.each do |l|
+          resolved_body = l[url]
+          return resolved_body if resolved_body
+        end
+        nil
+      end
+    
       def parse(document)
         document.gsub!('esi:', 'esi_')
         
@@ -113,19 +127,27 @@ class EsiForRack
 
       def process(doc_fragment)
         # have to go one at a time because of limitation of .css, its not a live list.
-        while esi_node = doc_fragment.css('esi_try,esi_choose,esi_vars,esi_include')[0]
-          case esi_node.name.to_sym
-          when :esi_include
-            @include.init(esi_node, self).execute_in_place!
-          when :esi_choose
-            @choose.init(esi_node, self).execute_in_place!
-          when :esi_vars
-            @vars.init(esi_node, self).execute_in_place!
-          when :esi_try
-            @try.init(esi_node, self).execute_in_place!
+        # ps, i'll only break if i totally have to
+        loop do
+          should_break = true
+          doc_fragment.css('esi_try,esi_choose,esi_vars,esi_include').each do |esi_node|
+            should_break = false
+            case esi_node.name.to_sym
+            when :esi_include
+              @include.init(esi_node, self).execute_in_place!
+            when :esi_choose
+              @choose.init(esi_node, self).execute_in_place!
+            when :esi_vars
+              @vars.init(esi_node, self).execute_in_place!
+            when :esi_try
+              @try.init(esi_node, self).execute_in_place!
+              break
+            end
           end
+          break if should_break
         end
       end
+      
     end
     
   end

data/spec/http_integration/cookie_spec.rb

@@ -16,7 +16,7 @@ describe "esi cookie variable lookups" do
 
     request = Rack::MockRequest.env_for("/?#{Rack::Utils.build_query(vars)}")
     request['HTTP_COOKIE'] = 'id=1'
-    builder.call(request).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>resource</body></html>\n"]
+    builder.call(request).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>\nresource\n</body></html>\n"]
     
   end
   

data/spec/http_integration/query_string_spec.rb

@@ -15,7 +15,7 @@ describe "esi query string variable lookups" do
     end
 
     request = Rack::MockRequest.env_for("/?#{Rack::Utils.build_query(vars)}")
-    builder.call(request).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>resource</body></html>\n"]
+    builder.call(request).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>\nresource\n</body></html>\n"]
     
   end
   

data/spec/http_integration/user_agent_spec.rb

@@ -2,7 +2,7 @@ require 'spec/spec_helper'
 
 describe "esi user agent variable lookups" do
   
-  it "should lookup a cookie variable" do
+  it "should lookup a user agent variable" do
     
     vars = {'type' => 'user'}
     builder = Rack::Builder.new do
@@ -16,7 +16,7 @@ describe "esi user agent variable lookups" do
 
     request = Rack::MockRequest.env_for("/?#{Rack::Utils.build_query(vars)}")
     request['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.2) Gecko/20060308 Firefox/1.5.0.2'
-    builder.call(request).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>\nbrowserosversion\n</body></html>\n"]
+    builder.call(request).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>\n  browserosversion\n</body></html>\n"]
     
   end
   

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-I_KNOW_I_AM_USING_AN_OLD_AND_BUGGY_VERSION_OF_LIBXML2 = true
-
 require 'rack'
 require 'lib/esi_for_rack'
 

data/spec/tags/include_spec.rb

@@ -3,11 +3,11 @@ require 'spec/spec_helper'
 describe "esi include" do
   
   it "should include a src" do
-    build_app('spec/tags/fixtures/include/src.html', {'/great' => "<p>This is great</p>"}).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body><p>This is great</p></body></html>\n"]
+    build_app('spec/tags/fixtures/include/src.html', {'/great' => "<p>This is great</p>"}).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>\n<p>This is great</p>\n</body></html>\n"]
   end
   
   it "should include an alt if src is unavilable" do
-    build_app('spec/tags/fixtures/include/alt.html', {'/alternate' => "<p>This is great</p>"}).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body><p>This is great</p></body></html>\n"]
+    build_app('spec/tags/fixtures/include/alt.html', {'/alternate' => "<p>This is great</p>"}).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>\n<p>This is great</p>\n</body></html>\n"]
   end
   
   it "should raise an error if src is unavilable" do
@@ -19,7 +19,7 @@ describe "esi include" do
   end
   
   it "should continue though, if onerror=continue" do
-    build_app('spec/tags/fixtures/include/src_continue.html', {}).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body></body></html>\n"]
+    build_app('spec/tags/fixtures/include/src_continue.html', {}).last.should == ["<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body>\n\n</body></html>\n"]
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-esi-for-rack
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -07:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - spec/tags/vars_spec.rb
 has_rdoc: false
 homepage: http://github.com/joshbuddy/esi_for_rack
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: ESI for Rack