fishwife 1.4.1-java → 1.5.0-java

data/History.rdoc

@@ -1,16 +1,8 @@
-=== 1.4.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.
+=== 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.0 (2012-12-13)
 * Upgrade/broaden to rjack-jetty [7.6.7,9.1). This includes 9.0.0.0

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.4.1.jar
+lib/fishwife/fishwife-1.5.0.jar

data/example/config.ru

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

data/example/giant.ru

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

data/lib/fishwife/base.rb

@@ -15,6 +15,6 @@
 #++
 
 module Fishwife
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
   LIB_DIR = File.dirname( __FILE__ )
 end

data/lib/rack/handler/fishwife.rb

@@ -15,33 +15,8 @@
 #++
 
 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
-
   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.4.1</version>
+  <version>1.5.0</version>
   <name>Fishwife Java Extension</name>
 
   <properties>

data/spec/fishwife_spec.rb

@@ -72,7 +72,7 @@ describe Fishwife do
     response = get("/echo")
     response.code.should == "200"
     content = JSON.parse(response.body)
-    content["rack.version"].should == [ 1, 1 ]
+    content["rack.version"].should == [ 1, 2 ]
     content["rack.multithread"].should be_true
     content["rack.multiprocess"].should be_false
     content["rack.run_once"].should be_false

metadata

@@ -2,14 +2,14 @@
 name: fishwife
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.4.1
+  version: 1.5.0
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.2
     none: false
   prerelease: false
   type: :runtime
@@ -31,21 +31,21 @@ dependencies:
   name: rjack-jetty
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 7.6.7
-    - - <
+        version: 9.0.0
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: 9.0.0.5
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 7.6.7
-    - - <
+        version: 9.0.0
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: 9.0.0.5
     none: false
   prerelease: false
   type: :runtime
@@ -53,21 +53,15 @@ dependencies:
   name: rjack-slf4j
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.7.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.7.2
     none: false
   prerelease: false
   type: :runtime
@@ -77,13 +71,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.7
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.7
     none: false
   prerelease: false
   type: :development
@@ -93,13 +87,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
     none: false
   prerelease: false
   type: :development
@@ -109,13 +103,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.0
     none: false
   prerelease: false
   type: :development
@@ -164,7 +158,7 @@ files:
 - spec/test_app.rb
 - spec/data/hello.txt
 - spec/data/reddit-icon.png
-- lib/fishwife/fishwife-1.4.1.jar
+- lib/fishwife/fishwife-1.5.0.jar
 homepage: http://github.com/dekellum/fishwife
 licenses: []
 post_install_message: