mikehale-rat-hole 0.1.8 → 0.1.9

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= 0.1.9
+
+* test tidy
+
 = 0.1.8
 
 * bug fixes

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 8
+:patch: 9

data/lib/rat_hole.rb

@@ -44,11 +44,12 @@ class RatHole
       code = response.code.to_i
       headers = response.to_hash
       body = response.body || ''
-      body = tidy_html(body) if @tidy
       headers.delete('Transfer-Encoding')
 
       server_response = Rack::Response.new(body, code, headers)
       whack_array(server_response)
+      tidy_html(body) if server_response["Content-Type"] =~ /text\/html/ && @tidy
+      
       process_server_response(server_response, source_request)
       server_response.finish
     end
@@ -67,12 +68,13 @@ class RatHole
       $stderr.puts "tidy not found in path"
       return
     end
-    tidied = Open3.popen3('tidy -ascii') do |stdin, stdout, stderr|
+    tidied, errors = Open3.popen3('tidy -ascii') do |stdin, stdout, stderr|
       stdin.print body
       stdin.close
-      stdout.read
+      [stdout.read, stderr.read]
     end
-    body.replace(tidied)
+    $stderr.puts errors if $DEBUG
+    body.replace(tidied) if tidied != ""
   end
 
   def request_headers(env)

data/test/test_rat_hole.rb

@@ -53,9 +53,9 @@ class TestRatHole < Test::Unit::TestCase
     MockRequest.new(@io.written)
   end
 
-  def send_get_request(rack_env={}, uri='/someuri')
+  def send_get_request(rack_env={}, uri='/someuri', tidy=false)
     opts = {:lint=>true}.merge(rack_env)
-    rh = RatHole.new('127.0.0.1')
+    rh = RatHole.new('127.0.0.1', tidy)
     Rack::MockRequest.new(rh).get(uri, opts)
   end
 
@@ -182,6 +182,19 @@ class TestRatHole < Test::Unit::TestCase
     send_post_request('', '/uri?with=param')
     assert_equal('/uri?with=param', proxied_request.uri)
   end
+  
+  def test_tidy_fails
+    body = '<something tidy <will </barf on'
+    mock_server(:body => body)
+    response = send_get_request({}, '/', true)
+    assert_equal(response.body, body)
+  end
+
+  def test_tidy_tidies
+    mock_server(:body => 'tidy me')
+    response = send_get_request({:lint=>false}, '/', true)
+    assert response.body =~ /html/i
+  end
 end
 
 class TestEmptyRatHole < RatHoleTest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mikehale-rat-hole
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Michael Hale