Content encoding fixes.

* `em-http-client` has issues with large gzip responses - stripping gzip headers for now as a workaround. * Fix issue with UTF8/BINARY encodings in responses. * Add Tumblr API example.
joko3ono · Oct 12, 2012 · 1149024 · 1149024
1 parent 67c3f33
commit 1149024
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puffing-billy (0.0.1)
+    puffing-billy (0.1.0)
       em-http-request
       eventmachine
       eventmachine_httpserver

diff --git a/bin/proxy.rb b/bin/proxy.rb
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'billy'
+Billy::Proxy.new.start(false)
diff --git a/examples/tumblr_api.html b/examples/tumblr_api.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<body>
+  <h1>Latest news</h1>
+  <div id="news"></div>
+
+  <script type='text/javascript' src='http://code.jquery.com/jquery-1.8.2.min.js'></script>
+  <script type='text/javascript'>
+  $(function () {
+    var url = 'http://blog.howmanyleft.co.uk/api/read/json?callback=?&type=text&num=3&filter=text';
+    $.getJSON(url, function (data) {
+      $.each(data.posts, function (idx, post) {
+        var title = post['regular-title'];
+        var href = post['url-with-slug'];
+        var body = post['regular-body'];
+        $('#news').append(
+          '<h3><a href="' + href + '">' + title + '</a></h3>' +
+          '<p>' + body + '</p>');
+      });
+    });
+  })
+  </script>
+</body>
diff --git a/lib/billy/proxy.rb b/lib/billy/proxy.rb
@@ -8,20 +8,13 @@ def initialize
       reset
     end
 
-    def start
-      Thread.new do
-        EM.run do
-          EM.error_handler do |e|
-            puts e.class.name, e
-            puts e.backtrace.join("\n")
-          end
-
-          @signature = EM.start_server('127.0.0.1', 0, ProxyConnection) do |p|
-            p.handler = self
-          end
-        end
+    def start(threaded = true)
+      if threaded
+        Thread.new { main_loop }
+        sleep(0.01) while @signature.nil?
+      else
+        main_loop
       end
-      sleep(0.01) while @signature.nil?
     end
 
     def url
@@ -63,5 +56,20 @@ def find_stub(method, url)
       end
       nil
     end
+
+    def main_loop
+      EM.run do
+        EM.error_handler do |e|
+          puts e.class.name, e
+          puts e.backtrace.join("\n")
+        end
+
+        @signature = EM.start_server('127.0.0.1', 0, ProxyConnection) do |p|
+          p.handler = self
+        end
+
+        Billy.log(:info, "Proxy listening on #{url}")
+      end
+    end
   end
 end
diff --git a/lib/billy/proxy_connection.rb b/lib/billy/proxy_connection.rb
@@ -85,6 +85,7 @@ def handle_request
 
     def proxy_request
       headers = Hash[@headers.map { |k,v| [k.downcase, v] }]
+      headers.delete('accept-encoding')
 
       req = EventMachine::HttpRequest.new(@url)
       req_opts = {
@@ -98,15 +99,15 @@ def proxy_request
       req = req.send(@parser.http_method.downcase, req_opts)
 
       req.errback do
-        puts "Request failed: #{url}"
+        puts "Request failed: #{@url}"
         close_connection
       end
 
       req.callback do
         res = EM::DelegatedHttpResponse.new(self)
         res.status = req.response_header.status
         res.headers = req.response_header.merge('Connection' => 'close')
-        res.content = req.response
+        res.content = req.response.force_encoding('BINARY')
         res.send_response
       end
     end

diff --git a/spec/requests/examples/tumblr_api_spec.rb b/spec/requests/examples/tumblr_api_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'Tumblr API example', :type => :request, :js => true do
+  before do
+    proxy.stub('http://blog.howmanyleft.co.uk/api/read/json').and_return(
+      :jsonp => {
+        :posts => [
+          {
+            'regular-title' => 'News Item 1',
+            'url-with-slug' => 'http://example.com/news/1',
+            'regular-body' => 'News item 1 content here'
+          },
+          {
+            'regular-title' => 'News Item 2',
+            'url-with-slug' => 'http://example.com/news/2',
+            'regular-body' => 'News item 2 content here'
+          }
+        ]
+    })
+  end
+
+  it 'should show news stories', :js => true do
+    visit '/tumblr_api.html'
+    page.should have_link('News Item 1', :href => 'http://example.com/news/1')
+    page.should have_content('News item 1 content here')
+    page.should have_link('News Item 2', :href => 'http://example.com/news/2')
+    page.should have_content('News item 2 content here')
+  end
+end
+