fishwife 1.5.0-java → 1.5.1-java

data/History.rdoc

@@ -1,9 +1,30 @@
+=== 1.5.1 (2013-5-7)
+* Override Rack::Server to disable the default inclusion of
+  Rack::Chunked middleware with "development" or "deployment"
+  environments. Otherwise Jetty may treat the chunked transfer-encoded
+  body as literal. The Rack::Server is used for example, when started
+  via `fishwife` or `rackup`. Note: Sinatra 1.4.x now honors these
+  middleware, exposing this problem as fishwife #5.
+
+  Also note that Rack::ContentLength is included by default with these
+  same environments, but is not included in other environments or
+  startup paths. Sinatra ensures the Content-Length itself. If not
+  using Sinatra or comparable, including `use Rack::ContentLength` is
+  advisable.
+
+* Also make Rack::Chunked a no-op, given `rackup` load order or other
+  cases where used.
+
 === 1.5.0 (2013-3-9)
 * Upgrade to rack ~> 1.5.2
 * Upgrade to rjack-jetty ~> 9.0.0 (>= 9.0.0.5/v20130308 release)
 * Upgrade/narrow to rjack-slf4j ~> 1.7.2, -logback ~> 1.2 (dev)
 * Upgrade to json ~> 1.7.7, rspec ~> 2.13.0 (dev)
 
+=== 1.4.1 (2013-5-7)
+* Disable Rack::Server default inclusion of Rack::Chunked (see full
+  description in 1.5.1)
+
 === 1.4.0 (2012-12-13)
 * Upgrade/broaden to rjack-jetty [7.6.7,9.1). This includes 9.0.0.0
   based on upstream M3, a milestone pre-release.

data/Manifest.txt

@@ -17,4 +17,4 @@ spec/spec_helper.rb
 spec/test_app.rb
 spec/data/hello.txt
 spec/data/reddit-icon.png
-lib/fishwife/fishwife-1.5.0.jar
+lib/fishwife/fishwife-1.5.1.jar

data/README.rdoc

@@ -69,7 +69,7 @@ will need to load an output provider (see linked docs.)
 
 == License
 
-Copyright (c) 2011-2012 David Kellum
+Copyright (c) 2011-2013 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/bin/fishwife

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/example/config.ru

@@ -1,5 +1,5 @@
-#\ -s Fishwife -p 9297 -O request_log_file=stderr -E none
-# The above is equivalent to 'rackup [options]'
+# -*- ruby -*-
+#\ -s Fishwife -p 9297
 
 # We don't assume SLF4J log output handler when launching via
 # 'rackup', so you should do something like this here.
@@ -7,6 +7,4 @@
 require 'rjack-logback'
 RJack::Logback.config_console( :stderr => true, :thread => true )
 
-use Rack::ContentLength
-
-run lambda { |env| [200, { "Content-Type" => "text/plain" }, ["Hello"]] }
+run proc { [ 200, {"Content-Type" => "text/plain"}, ["Hello", " world!\n"] ] }

data/example/giant.ru

@@ -1,5 +1,5 @@
-#\ -s Fishwife -p 9297 -E production
 # -*- ruby -*-
+#\ -s Fishwife -p 9297 -E production
 
 require 'rjack-logback'
 RJack::Logback.config_console( :stderr => true, :thread => true )

data/lib/fishwife.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/lib/fishwife/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -15,6 +15,6 @@
 #++
 
 module Fishwife
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
   LIB_DIR = File.dirname( __FILE__ )
 end

data/lib/fishwife/http_server.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/fishwife/rack_servlet.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/lib/rack/handler/fishwife.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -15,8 +15,44 @@
 #++
 
 require 'fishwife'
+require 'rack/server'
+require 'rack/chunked'
 
 module Rack
+
+  class Server
+    alias orig_middleware middleware
+
+    # Override to remove Rack::Chunked middleware from defaults of any
+    # environment. Rack::Chunked doesn't play nice with Jetty which
+    # does its own chunking. Unfortunately rack doesn't have a better
+    # way to indicate this incompatibility.
+    def middleware
+      mw = Hash.new { |h,k| h[k] = [] }
+      orig_middleware.each do |env, wares|
+        mw[ env ] = cream( wares )
+      end
+      mw
+    end
+
+    def cream( wares )
+      wares.reject do |w|
+        w == Rack::Chunked || ( w.is_a?( Array ) && w.first == Rack::Chunked )
+      end
+    end
+  end
+
+  # Use of `rackup` may still include Rack::Chunked given load order.
+  # Override chunk as No-Op.
+  class Chunked
+    def initialize( app )
+      @app = app
+    end
+    def call( env )
+      @app.call( env )
+    end
+  end
+
   module Handler
     # Rack expects Rack::Handler::Fishwife via require 'rack/handler/fishwife'
     class Fishwife

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>fishwife</groupId>
   <artifactId>fishwife</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.0</version>
+  <version>1.5.1</version>
   <name>Fishwife Java Extension</name>
 
   <properties>

data/spec/fishwife_spec.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/spec/test_app.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2012 David Kellum
+# Copyright (c) 2011-2013 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

metadata

@@ -2,14 +2,14 @@
 name: fishwife
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.5.0
+  version: 1.5.1
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -158,7 +158,7 @@ files:
 - spec/test_app.rb
 - spec/data/hello.txt
 - spec/data/reddit-icon.png
-- lib/fishwife/fishwife-1.5.0.jar
+- lib/fishwife/fishwife-1.5.1.jar
 homepage: http://github.com/dekellum/fishwife
 licenses: []
 post_install_message: