rack-jetty 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/rack_jetty/servlet_handler.rb

@@ -22,7 +22,7 @@ module RackJetty
         env = DefaultRackEnv.merge({
           'rack.input' => Rack::RewindableInput.new(JavaInput.new(request.get_input_stream)),
           'rack.url_scheme' => request.get_scheme,
-          'CONTENT_TYPE' => request.get_content_type.to_s,
+          'CONTENT_TYPE' => request.get_content_type,
           'CONTENT_LENGTH' => request.get_content_length, # some post-processing done below
           'REQUEST_METHOD' => request.get_method || "GET",
           'REQUEST_URI' => request.getRequestURI,
@@ -41,6 +41,17 @@ module RackJetty
           env[k] = request.getHeader(h) unless env.has_key?(k)
         end
 
+        # request.get_content_type returns nil if the Content-Type is not included
+        # and Rack doesn't expect Content-Type => '' - certain methods will issue 
+        # a backtrace if it's passed in. 
+        #
+        # The correct behaviour is not to include Content-Type in the env hash
+        # if it is blank. 
+        #
+        # https://github.com/rack/rack/issues#issue/40 covers the problem from
+        # Rack's end. 
+        env.delete('CONTENT_TYPE') if [nil, ''].include?(env['CONTENT_TYPE'])
+
         status, headers, output = handler.app.call(env)
         
         if (match = %r{^([0-9]{3,3}) +([[:print:]]+)$}.match(status.to_s))
@@ -62,11 +73,11 @@ module RackJetty
         
         buffer = response.get_output_stream
         output.each do |s|
-          buffer.print(s)
+          buffer.write(s.to_java_bytes)
         end
       ensure
         request.set_handled(true)
       end
     end
   end
-end
+end

data/spec/rack_handler_jetty_spec.rb

@@ -1,12 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'rack/handler/jetty'
 require 'rack/lint'
+require 'rack/builder'
+require 'rack/static'
 
 describe Rack::Handler::Jetty do
   include TestRequest::Helpers
   
   before :all do
-    @server = Rack::Handler::Jetty.new(Rack::Lint.new(TestRequest.new), :Host => @host='0.0.0.0',:Port => @port=9204)
+    app = Rack::Builder.app do
+      use Rack::Lint
+      use Rack::Static, :urls => ["/spec/images"]
+      run TestRequest.new
+    end
+    
+    @server = Rack::Handler::Jetty.new(app, :Host => @host='0.0.0.0',:Port => @port=9204)
     Thread.new do
       @server.run
     end
@@ -59,4 +67,17 @@ describe Rack::Handler::Jetty do
     status.should == 403
     response["rack.url_scheme"].should == "http"
   end
+
+  it "should not set content-type to '' in requests" do
+    GET("/test", 'Content-Type' => '')
+    response['Content-Type'].should == nil
+  end
+  
+  it "should serve images" do
+    file_size = File.size(File.join(File.dirname(__FILE__), 'images', 'image.jpg'))
+    GET("/spec/images/image.jpg")
+    status.should == 200
+    response.content_length.should == file_size
+    response.body.size.should == file_size
+  end
 end

data/spec/spec_helper.rb

@@ -43,10 +43,10 @@ class TestRequest
         get.basic_auth user, passwd  if user && passwd
         http.request(get) { |response|
           @status = response.code.to_i
-          begin
-            @response = YAML.load(response.body)
-          rescue ArgumentError
-            @response = nil
+          if response.content_type == "text/yaml"
+            load_yaml(response)
+          else
+            @response = response
           end
         }
       }
@@ -66,5 +66,13 @@ class TestRequest
         }
       }
     end
+    
+    def load_yaml(response)
+      begin
+        @response = YAML.load(response.body)
+      rescue ArgumentError
+        @response = nil
+      end   
+    end
   end
 end

metadata

@@ -3,48 +3,48 @@ name: rack-jetty
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+    - 0
+    - 2
+    - 0
+  version: 0.2.0
 platform: ruby
 authors: 
-- Graham Batty
+  - Graham Batty
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 -07:00
+date: 2010-11-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 2
+              - 9
+            version: 1.2.9
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rack
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
+            version: 1.0.0
+    type: :runtime
+    version_requirements: *id002
 description: Allows you to use Jetty as a Rack adapter in JRuby. Compatible with rackup and rails' Rack support.
 email: graham@stormbrew.ca
 executables: []
@@ -52,51 +52,51 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+  - LICENSE
+  - README.rdoc
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- lib/rack/handler/jetty.rb
-- lib/rack_jetty/jars/core-3.1.1.jar
-- lib/rack_jetty/jars/jetty-6.1.14.jar
-- lib/rack_jetty/jars/jetty-plus-6.1.14.jar
-- lib/rack_jetty/jars/jetty-util-6.1.14.jar
-- lib/rack_jetty/jars/jsp-2.1.jar
-- lib/rack_jetty/jars/jsp-api-2.1.jar
-- lib/rack_jetty/jars/servlet-api-2.5-6.1.14.jar
-- lib/rack_jetty/java_input.rb
-- lib/rack_jetty/servlet_handler.rb
-- spec/rack_handler_jetty_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+  - .document
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+  - VERSION
+  - lib/rack/handler/jetty.rb
+  - lib/rack_jetty/jars/core-3.1.1.jar
+  - lib/rack_jetty/jars/jetty-6.1.14.jar
+  - lib/rack_jetty/jars/jetty-plus-6.1.14.jar
+  - lib/rack_jetty/jars/jetty-util-6.1.14.jar
+  - lib/rack_jetty/jars/jsp-2.1.jar
+  - lib/rack_jetty/jars/jsp-api-2.1.jar
+  - lib/rack_jetty/jars/servlet-api-2.5-6.1.14.jar
+  - lib/rack_jetty/java_input.rb
+  - lib/rack_jetty/servlet_handler.rb
+  - spec/images/image.jpg
+  - spec/rack_handler_jetty_spec.rb
+  - spec/spec.opts
+  - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/stormbrew/rack-jetty
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -105,5 +105,5 @@ signing_key:
 specification_version: 3
 summary: Very simple (mostly Ruby) implementation of jetty as a pure Rack adapter.
 test_files: 
-- spec/rack_handler_jetty_spec.rb
-- spec/spec_helper.rb
+  - spec/rack_handler_jetty_spec.rb
+  - spec/spec_helper.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC