avdi-rack_base_uri 0.0.4 → 0.0.5

data/lib/rack_base_uri.rb

@@ -26,7 +26,16 @@ module Rack
 
       result  = @app.call(env)
       headers = result[1]
-      doc     = Hpricot(result[2].to_s)
+
+      # We have to get the content this way because the Rack spec only
+      # guarantees the presence of an #each method that yields Strings.  We
+      # can't expect #inject or #to_s or anything.
+      content = ""
+      result[2].each do |chunk|
+        content << chunk
+      end
+
+      doc     = Hpricot(content)
       case headers['Content-Type']
       when 'text/html'
         (doc/'head').append("<base href='#{base}'>")

data/spec/rack_base_uri_spec.rb

@@ -5,6 +5,21 @@ require 'rack/urlmap'
 require 'hpricot'
 
 describe Rack::BaseUri do
+
+  # This class is used to keep us honest... we can only depend on the content
+  # responding to each, not necessarily that it is Array-like.
+  class ContentStream
+    def initialize(content)
+      @content = content
+    end
+
+    def each
+      @content.each do |chunk|
+        yield chunk
+      end
+    end
+  end
+  
   before :each do
     @headers = {'Content-Type' => 'text/html'}
     @body    = <<-HTML
@@ -18,7 +33,7 @@ describe Rack::BaseUri do
     @result  = [
       200,
       @headers,
-      [@body]
+      ContentStream.new(@body)
     ]
     @app     = stub("app", :call => @result)
     @it      = Rack::BaseUri.new(@app)
@@ -29,7 +44,7 @@ describe Rack::BaseUri do
   def do_request
     @map      = Rack::URLMap.new({@base => @it})
     @request  = Rack::MockRequest.new(@map)
-    @response = @request.get("/subdir/foo", 'HTTP_HOST' => @host)
+    @response = @request.get("/subdir/foo", 'HTTP_HOST' => @host, :lint => true)
     @doc      = Hpricot(@response.body)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: avdi-rack_base_uri
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Avdi Grimm