reel-rack 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c61306f5108aecfb3610f71ddc1bfc032592193b
-  data.tar.gz: 62ffa8bc88e7128ebae5c3d4ab39b8477a0efd9e
+  metadata.gz: 63b096952fd168d6a393e3e72a1e042cbd46d48e
+  data.tar.gz: e6fb8172123d070e07cb0da3c1e48be553b9fb89
 SHA512:
-  metadata.gz: 8ee8a4a4c93aec6375caf87e314ec73890b275274f3c92a4664f15bb672dfa78278d4ed5b27204dc60676a636b6e9521c3f150a8466ebf0dd183253f11fb28dc
-  data.tar.gz: ba63f4cd58b68d51de6ba4ba91790945c971e445dac2f7246f5e5f0015db46f28f04f90541a8ee39274451d0bcd84c62cdd379c2b8674dd541721f13ae4aaebc
+  metadata.gz: 1d123755ec3fa199eafc3740be39dae4f28f16d9e9e8bf9b3b1127e4292faeef4df8b1dbe6a8bb6d807637c526169c223285d436a3ab942a24b3f2100e5aa127
+  data.tar.gz: 86aaab1608695ce38ab53950cf46f8a312bcc301556f65b34c680e3071c5a9edfd7169274c5bae26d6a646ed500ed5bd579bd33057d7dfdd8447b0a59e157fe4

data/.rspec

@@ -1,4 +1,5 @@
---color 
---format documentation 
+--color
+--format documentation
 --backtrace
---default_path spec
+--order random
+--warnings

data/.travis.yml

@@ -1,8 +1,9 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
   - ruby-head
-  - jruby-19mode
+  - jruby
   - jruby-head
   - rbx-2
 

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.2.1 (2014-12-17)
+------------------
+* Bugfixes for responding with chunked encoding
+
 0.2.0 (2014-04-15)
 ------------------
 * Updated to be API compatible with Reel 0.5.0

data/lib/reel/rack/server.rb

@@ -31,6 +31,9 @@ module Reel
         end
       end
    
+      # Compile the regex once
+      CONTENT_LENGTH_HEADER = %r{^content-length$}i
+
       def route_request(request)
         options = {
           :method       => request.method,
@@ -40,12 +43,18 @@ module Reel
    
         status, headers, body = app.call ::Rack::MockRequest.env_for(request.url, options)
 
-        if body.respond_to?(:to_str)
-          request.respond status_symbol(status), headers, body.to_str
-        elsif body.respond_to?(:each)
-          request.respond status_symbol(status), headers.merge(:transfer_encoding => :chunked)
-          body.each { |chunk| request << chunk }
-          request.finish_response
+        if body.respond_to? :each
+          # If Content-Length was specified we can send the response all at once
+          if headers.keys.detect { |h| h =~ CONTENT_LENGTH_HEADER }
+            # Can't use collect here because Rack::BodyProxy/Rack::Lint isn't a real Enumerable
+            full_body = ''
+            body.each { |b| full_body << b }
+            request.respond status_symbol(status), headers, full_body
+          else
+            request.respond status_symbol(status), headers.merge(:transfer_encoding => :chunked)
+            body.each { |chunk| request << chunk }
+            request.finish_response
+          end
         else
           Logger.error("don't know how to render: #{body.inspect}")
           request.respond :internal_server_error, "An error occurred processing your request"

data/lib/reel/rack/version.rb

@@ -1,5 +1,5 @@
 module Reel
   module Rack
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/reel/rack/server_spec.rb

@@ -6,30 +6,31 @@ require 'rack/head'
 describe Reel::Rack::Server do
   let(:host) { "127.0.0.1" }
   let(:port) { 30000 }
+  let(:headers) { {"Content-Type" => "text/plain", "Content-Length" => body.length.to_s} }
   let(:body) { "hello world" }
+  let(:uri) { URI("http://#{host}:#{port}/") }
+  let(:http) { Net::HTTP.new(uri.host, uri.port) }
 
   subject do
-    app = proc { [200, {"Content-Type" => "text/plain"}, [body]] }
+    app = proc { [200, headers, [body]] }
     described_class.new(Rack::Lint.new(Rack::Head.new(app)), :Host => host, :Port => port)
   end
 
-  it "runs a basic Hello World app" do
+  before do
     # Hax to wait for server to be started
     subject.inspect
+  end
 
-    expect(Net::HTTP.get(URI("http://#{host}:#{port}"))).to eq body
-
+  after do
     subject.terminate
   end
 
-  it "success with basic HTTP methods" do
-    # Hax to wait for server to be started
-    subject.inspect
 
-    uri = URI("http://#{host}:#{port}/")
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.set_debug_output($stderr)
+  it "runs a basic Hello World app" do
+    expect(http.request_get(uri.path).body).to eq body
+  end
 
+  it "success with basic HTTP methods" do
     expect(http.request_get(uri.path).body).to eq body
     expect(http.request_head(uri.path).body).to eq nil
 
@@ -37,7 +38,19 @@ describe Reel::Rack::Server do
     expect(http.send_request('PUT', uri.path, "test").body).to eq body
     expect(http.send_request('PATCH', uri.path, "test").body).to eq body
     expect(http.send_request('DELETE', uri.path).body).to eq body
+  end
 
-    subject.terminate
+  it "disables chunked transfer if a Content-Length header is set" do
+    expect(http.send_request('GET', uri.path, 'test')['content-length']).to_not eq nil
+    expect(http.send_request('GET', uri.path, 'test')['transfer-encoding']).to_not eq 'chunked'
+  end
+
+  context "with no Content-Length header and the body is Enumerable" do
+    let(:headers) { {"Content-Type" => "text/plain"} }
+
+    it "sends a chunked transfer response if there is no Content-Length header and the body is Enumerable" do
+      expect(http.send_request('GET', uri.path, 'test')['content-length']).to eq nil
+      expect(http.send_request('GET', uri.path, 'test')['transfer-encoding']).to eq 'chunked'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reel-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -129,11 +129,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rack adapter for Reel, a Celluloid::IO web server
 test_files:
 - spec/reel/rack/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: